some simplifications in G&C model generator