CS and docblock fixes

Third of a few pulls to replace #6.
I really dislike it, and it's not useful when you're looking at the source code.