Refactor changes.