more tweaks to formatting