Refactoring
PHPCS