overzealous refactoring