The great refactoring winds down!