lots of formatting fixes

It should still compile, but I can't check.
6 files changed