diff --git a/Queries.java b/Queries.java
index ffd2926..f961570 100644
--- a/Queries.java
+++ b/Queries.java
@@ -52,15 +52,8 @@ public List<String> getSoldUnitsInMillionsPerYearFromAllOutdatedConsoles() {
   }
 
   public Map<Maker, Double> getTotalSoldUnitsInMillionsPerMaker() {
-    Function<Entry<Maker, List<Console>>, Maker> entrySetToMaker = entrySet -> entrySet.getKey();
-    Function<Entry<Maker, List<Console>>, Double> entrySetToSoldUnits =
-        entrySet ->
-            entrySet.getValue().stream()
-                .mapToDouble(console -> console.soldUnitsInMillions())
-                .sum();
-
-    return getAllConsolesByMaker().entrySet().stream()
-        .collect(Collectors.toMap(entrySetToMaker, entrySetToSoldUnits));
+    return consoles.stream()
+            .collect(Collectors.groupingBy(Console::maker, Collectors.summingDouble(Console::soldUnitsInMillions)));
   }
 
   public boolean isAllConsolesWithMoreThan50MillionSoldUnits() {