Coding-standards compliance, and tidied up docblocks. No semantic changes.
Merge pull request #2 from samwilson/code-style

Coding-standards compliance, and tidied up docblocks