PSR2 edits and docblock updates

Updated docblocks to reflect the current API and signatures.
Updated minor edits for PSR2 compliance.