Still working on PHPCS