diff --git a/language-C++/Memory/src/Memory.Aux.cpp b/language-C++/Memory/src/Memory.Aux.cpp
index ae4044e..be596b3 100644
--- a/language-C++/Memory/src/Memory.Aux.cpp
+++ b/language-C++/Memory/src/Memory.Aux.cpp
@@ -7,8 +7,10 @@ std::map<int, int> memory_generateConstPlayfield(
   std::map<int, int> idGroups;
   int id = 0;
   for (int gid = 0; gid < n; ++gid) {
-    idGroups[id++] = gid;
-    idGroups[id++] = gid;
+    idGroups[id] = gid;
+    id += 1;
+    idGroups[id] = gid;
+    id += 1;
   }
   return idGroups;
 }
diff --git a/language-Swift/Memory/src/Memory.Test.swift b/language-Swift/Memory/src/Memory.Test.swift
index 01b7cd6..53e5d4d 100644
--- a/language-Swift/Memory/src/Memory.Test.swift
+++ b/language-Swift/Memory/src/Memory.Test.swift
@@ -9,6 +9,6 @@ func test_memory_generateConstPlayfield() -> String {
   ) {
     return "OK: memory_generateConstPlayfield"
   }
-  
-  return "ERR: memory_generateConstPlayfield";
+
+  return "ERR: memory_generateConstPlayfield"
 }