Refactoring changes.