Clear code. Moving generators to correct method