Refactoring of hashers