More minor fixes
Merge pull request #20 from ironcladlou/style-fixes

More minor fixes