reduce calls to .clone() and .to_string()
Merge pull request #1 from Dr-Emann/less_clones

Reduce calls to .clone() and .to_string()