Fix up a heap of code-style issues.
Merge pull request #302 from eddieajau/codestyle

Fix up a heap of code-style issues.