Changed to_string to to_str and removed unnecessary instances

Just some small changes to get it working with rust 'nightly' :-)