More polishing of the factory class.