Lots of formatting fixes.