Rewrote hashing portion again

Saved 3 lines of code, woo!