General tidy up of comments and some code, mainly whitespace.
Merge pull request #1 from Drarok/feature/tidy-up

General tidy up of comments and some code, mainly whitespace.