TODO consolidate formatters. These things are strewn everywhere