Again refactoring