more tweaks to format