PHPCS fixes for Category #33