fixup whitespace and style
Merge pull request #1 from osrf/fixup

fixup whitespace and style