Revert "Better -code- formatting"

This reverts commit 195ef1bcd95e1c4735ddca303ba06795f0045d6e.