Code needs cleaning up

[eromid]

There are some inconsistencies in the comments, formatting, style, etc, which need to be ironed out. What's there should be consistent enough to serve as a style guide, there are just a few places which need a bit of work.