Minor style fixes
Merge pull request #718 from mc10/style-fixes

Minor style fixes