Fix more PHPCS issues