a few simple style clean-ups
Merge pull request #2165 from awesomerobot/master

a few simple style clean-ups