formatting tweaks, mostly