Output formatting tweaks