Improving Formatter::format