Minor formatter tweaks