CS and docblock fixes

Third of a few pulls to replace #6.
The constructor actually implicitly returns itself, but the phpdoc manual actually says it shouldn't be specified at all.