Used str::from_utf8
Minor changes