diff --git a/selfdrive/car/car_helpers.py b/selfdrive/car/car_helpers.py
index 0704bc8950..90bfdd8a93 100644
--- a/selfdrive/car/car_helpers.py
+++ b/selfdrive/car/car_helpers.py
@@ -125,7 +125,7 @@ def fingerprint(logcan, sendcan):
       # The fingerprint dict is generated for all buses, this way the car interface
       # can use it to detect a (valid) multipanda setup and initialize accordingly
       if can.src < 128:
-        if can.src not in finger.keys():
+        if can.src not in finger:
           finger[can.src] = {}
         finger[can.src][can.address] = len(can.dat)
 
diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py
index 0469d50be2..bca730c1b3 100755
--- a/selfdrive/controls/controlsd.py
+++ b/selfdrive/controls/controlsd.py
@@ -563,7 +563,7 @@ class Controls:
 
   def update_button_timers(self, buttonEvents):
     # increment timer for buttons still pressed
-    for k in self.button_timers.keys():
+    for k in self.button_timers:
       if self.button_timers[k] > 0:
         self.button_timers[k] += 1
 
diff --git a/selfdrive/controls/lib/events.py b/selfdrive/controls/lib/events.py
index cd139c062a..4d693b0fbd 100644
--- a/selfdrive/controls/lib/events.py
+++ b/selfdrive/controls/lib/events.py
@@ -93,7 +93,7 @@ class Events:
     for event_name in self.events:
       event = car.CarEvent.new_message()
       event.name = event_name
-      for event_type in EVENTS.get(event_name, {}).keys():
+      for event_type in EVENTS.get(event_name, {}):
         setattr(event, event_type, True)
       ret.append(event)
     return ret
diff --git a/selfdrive/statsd.py b/selfdrive/statsd.py
index 33f35032ff..feb1c16337 100755
--- a/selfdrive/statsd.py
+++ b/selfdrive/statsd.py
@@ -44,8 +44,8 @@ class StatLog:
 def main():
   def get_influxdb_line(measurement: str, value: float, timestamp: datetime, tags: dict):
     res = f"{measurement}"
-    for tag_key in tags.keys():
-      res += f",{tag_key}={str(tags[tag_key])}"
+    for k, v in tags.items():
+      res += f",{k}={str(v)}"
     res += f" value={value} {int(timestamp.timestamp() * 1e9)}\n"
     return res
 
@@ -101,7 +101,7 @@ def main():
       current_time = datetime.utcnow().replace(tzinfo=timezone.utc)
       tags['started'] = sm['deviceState'].started
 
-      for gauge_key in gauges.keys():
+      for gauge_key in gauges:
         result += get_influxdb_line(f"gauge.{gauge_key}", gauges[gauge_key], current_time, tags)
 
       # clear intermediate data