Vignettes cleaned up