Merge "Iterate over entrySet instead of keySet"