more phpcs cleanup