more formatting tweaks/cleanup