Little refactoring to make individual methods in the factory public