Cosmetic improvements around hashing