minor Formatter update
more work on centralizing output to Formatter