Improve diffing

following some feedback