- code cleaning and bringing the generator priorities aligned