Refactoring the factory class part 2