Figured I'd contribute some style :P

Some alterations mostly as per the style guide.

Happy to squash into a single commit.

- Dom