CS and docblock fixes

Third of a few pulls to replace #6.
I think there was another similar case I changed. I'll revert them both.