Moved formatters out of switch;