The Great Refactoring I(a): Forgot about this