Refactoring. Factories eliminated.