More style fixes
Merge pull request #69 from ironcladlou/style-fixes

More style fixes