variable declaration cleanup/consistency

no functional changes made here. ran through all the tests and they passed, GUI looked good as well. eager to get this update into master so some proposed new blocks that write out to different data stores have decent reference points in the source code. resolves #463