Refactor vignettes