Tweak output format a bit