Changed to_string to to_str and removed unnecessary instances