Tweak a few formatting things