diff --git a/pysollib/game/__init__.py b/pysollib/game/__init__.py
index 1b3e0155..b8b8c1e9 100644
--- a/pysollib/game/__init__.py
+++ b/pysollib/game/__init__.py
@@ -1158,10 +1158,9 @@ class Game(object):
         # group stacks by class and cap
         sg = {}
         for s in self.allstacks:
-            for k in sg:
+            for k, g in sg.items():
                 if s.__class__ is k.__class__ and \
                        s.cap.__dict__ == k.cap.__dict__:
-                    g = sg[k]
                     g.append(s.id)
                     break
             else:
diff --git a/pysollib/kivy/tkhtml.py b/pysollib/kivy/tkhtml.py
index a603e8b3..7db90d32 100644
--- a/pysollib/kivy/tkhtml.py
+++ b/pysollib/kivy/tkhtml.py
@@ -116,8 +116,8 @@ class tkHTMLWriter(pysollib.formatter.NullWriter):
         }
 
         self.text.config(cursor=self.viewer.defcursor, font=font)
-        for f in self.fontmap.keys():
-            self.text.tag_config(f, font=self.fontmap[f])
+        for f, font in self.fontmap.items():
+            self.text.tag_config(f, font=font)
 
         self.anchor = None
         self.anchor_mark = None
diff --git a/pysollib/resource.py b/pysollib/resource.py
index 0861f591..b8e03533 100644
--- a/pysollib/resource.py
+++ b/pysollib/resource.py
@@ -652,12 +652,12 @@ class CardsetManager(ResourceManager):
         required_cards_needed = {
             CSI.TYPE_TRUMP_ONLY: 100
         }
-        for t in required_types.keys():
+        for t, t_v in required_types.items():
             if t not in self.registered_types:
                 missing.append(CSI.TYPE_NAME[t])
             else:
-                if len(required_types[t]) > 0:
-                    for tt in required_types[t]:
+                if len(t_v) > 0:
+                    for tt in t_v:
                         if tt not in self.registered_subtypes[t]:
                             missing.append(CSI.TYPE_NAME[t] + " (" +
                                            CSI.SUBTYPE_NAME[t][tt] + ")")
diff --git a/pysollib/tile/toolbar.py b/pysollib/tile/toolbar.py
index a240a8f0..8b697507 100644
--- a/pysollib/tile/toolbar.py
+++ b/pysollib/tile/toolbar.py
@@ -412,9 +412,9 @@ class PysolToolbarTk:
             self.frame.update_idletasks()
 
     def updateText(self, **kw):
-        for name in kw.keys():
+        for name, value in kw.items():
             label = getattr(self, name + "_label")
-            label["text"] = kw[name]
+            label["text"] = value
 
     def updateImages(self, dir, size):
         if dir == self.dir and size == self.size: