a handful of minor style updates/fixes
Merge pull request #2885 from awesomerobot/master

a handful of minor style updates/fixes