Remove string-format usage