Improve extended formatter