formatting tweaks mostly