Revert "Even more formatting tweaks"

This reverts commit d6c9293ac6a3b29b8cdad59832328e5b21533e9a.
Revert d6c9293..f2987ad

This rolls back to commit d6c9293ac6a3b29b8cdad59832328e5b21533e9a.
Revert "Even more formatting tweaks"

This reverts commit d6c9293ac6a3b29b8cdad59832328e5b21533e9a.