Various PHPCS fixes