more formatter tweaks