Refactoring for great good