Should we be doing some cleanup on the formatter?