start refactoring to remove one factory class