PHPCS cleanup