simplify a little more
clean up formatters + template function