Refactorings in ScenarioGenerator
Minor changes when generating CSS modesl