Bunch of little best practice refactors
Merge pull request #1 from jgwhite/lil-refactor

Bunch of little best practice refactors