Relentless refactoring