Various style fixes
Merge pull request #68 from ironcladlou/style-fixes

Various style fixes