Again refactoring.