[Generator] made some simplifications