Style fixes
Merge pull request #128 from jpoittevin/style-fix

Style fixes