PHPCS cleanup of layouts