Tweak formatting a bit more