more style/consistency fixes
Merge pull request #12 from uber/more_style_fixes

more style/consistency fixes