CS and docblock fixes

Third of a few pulls to replace #6.
So you're ok with this change?