Cleaning up PHPCS errors