Lots of changes for variable initialization - clean up, really,