PHPCS cleanup from template merge