Merge "Iterate over the entrySet instead of keySet"