Tiny hash refactor