Cleaning up the diff