Clean up make_string
Improve timing code