Small Hash related refactoring.