[Generator] [Behavior] simplified code