Couple formatting tweaks