style tweak
Bunch of little best practice refactors