formatter tweaks