Revert changes for phpcs
Improved docBlocks and minor cleanups