diff --git a/whipper/common/accurip.py b/whipper/common/accurip.py
index fea5e4a..0efa71c 100644
--- a/whipper/common/accurip.py
+++ b/whipper/common/accurip.py
@@ -231,7 +231,7 @@ def verify_result(result, responses, checksums):
     # exclude HTOA from AccurateRip verification
     # NOTE: if pre-gap hidden audio support is expanded to include
     # tracks other than HTOA, this is invalid.
-    tracks = filter(lambda t: t.number != 0, result.tracks)
+    tracks = [t for t in result.tracks if t.number != 0]
     if not tracks:
         return False
     _assign_checksums_and_confidences(tracks, checksums, responses)
@@ -251,10 +251,10 @@ def print_report(result):
             conf = '(max confidence    %3d)' % track.AR['DBMaxConfidence']
             if track.AR['v1']['DBCRC'] or track.AR['v2']['DBCRC']:
                 status = 'rip accurate'
-                db = ', '.join(filter(None, (
+                db = ', '.join([_f for _f in (
                     track.AR['v1']['DBCRC'],
                     track.AR['v2']['DBCRC']
-                )))
+                ) if _f])
             max_conf = max(
                 [track.AR[v]['DBConfidence'] for v in ('v1', 'v2')]
             )
diff --git a/whipper/common/program.py b/whipper/common/program.py
index 42325bd..3c10caf 100644
--- a/whipper/common/program.py
+++ b/whipper/common/program.py
@@ -570,7 +570,7 @@ class Program:
 
         checksums = accurip.calculate_checksums([
             os.path.join(os.path.dirname(self.cuePath), t.indexes[1].path)
-            for t in filter(lambda t: t.number != 0, cueImage.cue.table.tracks)
+            for t in [t for t in cueImage.cue.table.tracks if t.number != 0]
         ])
         if not (checksums and any(checksums['v1']) and any(checksums['v2'])):
             return False