CS and docblock fixes

Third of a few pulls to replace #6.
Nope, I 'd like this to stay what it was. This change breaks up the happy vs fail path.