More PHPCS fixes