Clean up the code structure to better handle various kinds of output formatting

[cthos]

Make formatting stuff a little cleaner. Probably do something like inject the appropriate format into the formatter so I don't have to do some of the crazy template logic in the actual formatter.