Additional formatting fixes
13 files changed