Very close to having all base formatting done.

Next: finish cleaning.