Use more efficient an entrySet iterator