Reformat various files.

Note, these files no longer need formating.