removed unused code
made _make_hash better thanks to @fakeezz