some more formatting tweaks