Some more style fixes, swap before and after diff

Only functional change is to fix the order of the diff. It is correct
now.