Tweak formatting to make code more obviously correct