various formatting tweaks