One refactoring