Refactoring Factories

- Change Factory Creator