Coding-standards compliance, and tidied up docblocks

No semantic changes.