Revert "Revert "Better -code- formatting""

This reverts commit c178e7e5fb42c2fdb63b73c1ed5d8a929e0a14b2.