Fixing PHPCS violations