Refactoring (only 3 lines)