Some coding standard and typo fixes
Merge pull request #27 from fontanalorenzo/formatting-fixes

Formatting fixes from @fontanalorenzo