More formatting fixes

Sigh...