Finally bit the bullet and go fmt everything.