refactoring of hash Map completed