Cosmetic update on Generator