stylistic consistency and misc changes
Merge pull request #1 from ianvanness/master

stylistic consistency and misc changes