CS and docblock fixes

Third of a few pulls to replace #6.
Actually, this is what the phpdoc documentation states: `constructors, the @return tag MAY be omitted here, in which case @return self is implied.`. So this is invalid. I'd rather remove it.