Style fixes
Merge pull request #24 from ironcladlou/style-fixes

Style fixes