Further refactoring of hashers