Improve string formatter a bit