phpcs cleanup