Revert "Revert "Revert "Revert "a bunch of formatting changes""""

This reverts commit 4a91aebc373cb598458204274889cd46f235c3a5.