tidy up diff