More pragmatic refactoring?