clean up diffs (mostly formatting issues)