diff --git a/picard/cluster.py b/picard/cluster.py
index f5705b866..3bd9d40bd 100644
--- a/picard/cluster.py
+++ b/picard/cluster.py
@@ -248,8 +248,8 @@ class Cluster(QtCore.QObject, Item):
 
         # Arrange tracks into albums
         albums = {}
-        for i in range(len(tracks)):
-            cluster = album_cluster_engine.getClusterFromId(tracks[i][1])
+        for i, track in enumerate(tracks):
+            cluster = album_cluster_engine.getClusterFromId(track[1])
             if cluster is not None:
                 albums.setdefault(cluster, []).append(i)
 
diff --git a/picard/ui/tagsfromfilenames.py b/picard/ui/tagsfromfilenames.py
index 808c7eae8..2ff30f9b6 100644
--- a/picard/ui/tagsfromfilenames.py
+++ b/picard/ui/tagsfromfilenames.py
@@ -113,9 +113,8 @@ class TagsFromFileNamesDialog(PicardDialog):
         self.ui.files.setHeaderLabels([_("File Name")] + list(map(display_tag_name, columns)))
         for item, file in zip(self.items, self.files):
             matches = self.match_file(file, format)
-            for i in range(len(columns)):
-                value = matches.get(columns[i], '')
-                item.setText(i + 1, value)
+            for i, column in enumerate(columns):
+                item.setText(i + 1, matches.get(column, ''))
         self.ui.files.header().resizeSections(QtWidgets.QHeaderView.ResizeToContents)
         self.ui.files.header().setStretchLastSection(True)