Formatter tweaks