Refactoring is near it's end