Revert "A few basic formatting fixes"

This reverts commit efa2dfa3972abf2b05a705d2912050f3953cad41.