fix code review:  Performance - Inefficient use of keySet iterator instead of entrySet iterator