Factory simplification