Alternative refactoring (not implemented)