Rewrote hashing portion again

Saved 4 lines of code, woo!