PHPCS Cleanup