Refactoring complete.