Basic PHPCS clean-up
PHPCS clean-up, mainly docblocks
Simple tests