Style guide fixups
Merge pull request #2 from eshamow/formatting

Style guide fixups