Same refactoring