CS and docblock fixes

Third of a few pulls to replace #6.
Can be the case, but from a maintainer point of view this will force me to update it in several locations when it needs updating. Could you revert it? Changes like this, which are personal should really be discussed, I hope you see why.