More formatting tweaks