Refactoring for the better good.