Simplify code, use values() on a Map instaed of entrySet when not need
of the key.