Fix code indentation/trailing whitespace
Fix semicolons
Merge pull request #43 from vmeurisse/codeStyle

Code style