More pragmatic refactoring