CS and docblock fixes

Third of a few pulls to replace #6.
Yeh. Are you 100% sure it's needed in all the other cases too?