changed diff colors
changed layout, removed unused comments