Refactoring for great justice.