Revert "More formatting cleanup"

This reverts commit 940842c74194f78ac940afc0de45dbd5bfd043d9.