Correct Sonar Critical Violations (#80)
Performance - Inefficient use of keySet iterator instead of entrySet iterator