clean up some of our hash code methods