Refactor and fix class/instance variables.
WIP -- refactor / re-indent and class/instance var