Refactor diffs