Get rid of extraneous formatter class