Minor style improvements
Merge pull request #29 from gremo/style-improvements

Minor style improvements