Java 8 syntax overhaul for Map Editor