Refactoring: collect changes.