minor tweaks and formatting