PHPCS Fixer cleanup