Cleaning up the diff for the pull request