formatting tweaks for 2.0.0