tidy up, minimize diff