CS and docblock fixes

Third of a few pulls to replace #6.
I haven't changed the functionality, I've just change the cs. We now throw at the end of the method.