More formatting tweakage