PHPCS Issue Fixes