CS and docblock fixes

Third of a few pulls to replace #6.
I see that, it' just that every valid scenario was at the beginning, falling back to the exception. Should is a reversed happy flow, which makes sense in this situation.