Some cleaning
Generator : Separated parameters from the rest