cleaning up diffs