diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py
index ae8a02eb0b..a603db5cf0 100644
--- a/selfdrive/car/toyota/values.py
+++ b/selfdrive/car/toyota/values.py
@@ -21,44 +21,47 @@ class CarControllerParams:
   STEER_ERROR_MAX = 350     # max delta between torque cmd and torque motor
 
 class CAR:
-  PRIUS = "TOYOTA PRIUS 2017"
-  PRIUS_TSS2 = "TOYOTA PRIUS TSS2 2021"
-  RAV4H = "TOYOTA RAV4 HYBRID 2017"
-  RAV4 = "TOYOTA RAV4 2017"
-  COROLLA = "TOYOTA COROLLA 2017"
-  LEXUS_RX = "LEXUS RX 2016"
-  LEXUS_RXH = "LEXUS RX HYBRID 2017"
-  LEXUS_RX_TSS2 = "LEXUS RX 2020"
-  LEXUS_RXH_TSS2 = "LEXUS RX HYBRID 2020"
-  CHR = "TOYOTA C-HR 2018"
-  CHRH = "TOYOTA C-HR HYBRID 2018"
+  # Toyota
+  ALPHARD_TSS2 = "TOYOTA ALPHARD 2020"
+  AVALON = "TOYOTA AVALON 2016"
+  AVALON_2019 = "TOYOTA AVALON 2019"
+  AVALONH_2019 = "TOYOTA AVALON HYBRID 2019"
   CAMRY = "TOYOTA CAMRY 2018"
   CAMRYH = "TOYOTA CAMRY HYBRID 2018"
   CAMRY_TSS2 = "TOYOTA CAMRY 2021"  # TSS 2.5
   CAMRYH_TSS2 = "TOYOTA CAMRY HYBRID 2021"
+  CHR = "TOYOTA C-HR 2018"
+  CHRH = "TOYOTA C-HR HYBRID 2018"
+  COROLLA = "TOYOTA COROLLA 2017"
+  COROLLA_TSS2 = "TOYOTA COROLLA TSS2 2019"
+  # LSS2 Lexus UX Hybrid is same as a TSS2 Corolla Hybrid
+  COROLLAH_TSS2 = "TOYOTA COROLLA HYBRID TSS2 2019"
   HIGHLANDER = "TOYOTA HIGHLANDER 2017"
   HIGHLANDER_TSS2 = "TOYOTA HIGHLANDER 2020"
   HIGHLANDERH = "TOYOTA HIGHLANDER HYBRID 2018"
   HIGHLANDERH_TSS2 = "TOYOTA HIGHLANDER HYBRID 2020"
-  AVALON = "TOYOTA AVALON 2016"
-  AVALON_2019 = "TOYOTA AVALON 2019"
-  AVALONH_2019 = "TOYOTA AVALON HYBRID 2019"
+  PRIUS = "TOYOTA PRIUS 2017"
+  PRIUS_TSS2 = "TOYOTA PRIUS TSS2 2021"
+  RAV4 = "TOYOTA RAV4 2017"
+  RAV4H = "TOYOTA RAV4 HYBRID 2017"
   RAV4_TSS2 = "TOYOTA RAV4 2019"
-  COROLLA_TSS2 = "TOYOTA COROLLA TSS2 2019"
-  # LSS2 Lexus UX Hybrid is same as a TSS2 Corolla Hybrid
-  COROLLAH_TSS2 = "TOYOTA COROLLA HYBRID TSS2 2019"
+  RAV4H_TSS2 = "TOYOTA RAV4 HYBRID 2019"
+  MIRAI = "TOYOTA MIRAI 2021" # TSS 2.5
+  SIENNA = "TOYOTA SIENNA 2018"
+
+  # Lexus
+  LEXUS_CTH = "LEXUS CT HYBRID 2018"
+  LEXUS_ESH = "LEXUS ES HYBRID 2018"
   LEXUS_ES_TSS2 = "LEXUS ES 2019"
   LEXUS_ESH_TSS2 = "LEXUS ES HYBRID 2019"
-  LEXUS_ESH = "LEXUS ES HYBRID 2018"
-  SIENNA = "TOYOTA SIENNA 2018"
   LEXUS_IS = "LEXUS IS 2018"
-  LEXUS_CTH = "LEXUS CT HYBRID 2018"
-  RAV4H_TSS2 = "TOYOTA RAV4 HYBRID 2019"
-  LEXUS_NXH = "LEXUS NX HYBRID 2018"
   LEXUS_NX = "LEXUS NX 2018"
+  LEXUS_NXH = "LEXUS NX HYBRID 2018"
   LEXUS_NX_TSS2 = "LEXUS NX 2020"
-  MIRAI = "TOYOTA MIRAI 2021" # TSS 2.5
-  ALPHARD_TSS2 = "TOYOTA ALPHARD 2020"
+  LEXUS_RX = "LEXUS RX 2016"
+  LEXUS_RXH = "LEXUS RX HYBRID 2017"
+  LEXUS_RX_TSS2 = "LEXUS RX 2020"
+  LEXUS_RXH_TSS2 = "LEXUS RX HYBRID 2020"
 
 # (addr, cars, bus, 1/freq*100, vl)
 STATIC_DSU_MSGS = [