Removed an unneeded reference type
Use Option<> Instead of panic!