Fixed up some redundant variable creation and removed the now unrequired import of std crate