Removed some to_string(