Fix PHPCS issues