Better Class name of generated Code.
some code cleanup.