Style fixes

To make our linting tool (described in PR #587) actually useful, we'll have to correct some of the trivial lint errors, such as trailing whitespace, indention errors and trailing semicolons. This PR does all that, but introduce no changes in logic what-so-ever.