More refactorings of class generator