Actually applied refactoring