Tidyup and rough colors for diff