Refactoring completed (for today).