Reformat again.

TODO: Squash the shit out of all these :p