A handful of small style fixes
Merge pull request #103 from alex/style-fixes

A handful of small style fixes