cleaned up the hash gen a little...