Tweaks to formatter
Reformat and minor cleanup