toString() formatting tweaks