more restructuring of ContactGenerator
Contactgenerator restructuring and optimizing