minor tweaks and reformatting