Refactor scale definition for vignette
Better comments