Refactoring completed.