Fix PHPCS Issues