Formatting improvements

Too many and too minor to even mention. Just check the diff if you
really are that curious.