diff --git a/bricksrc/equipment.py b/bricksrc/equipment.py
index 678be2c5..04c2313d 100644
--- a/bricksrc/equipment.py
+++ b/bricksrc/equipment.py
@@ -17,7 +17,7 @@
                     },
                     "Server": {
                         "tags": [TAG.Equipment, TAG.ICT, TAG.Hardware, TAG.Server]
-                    },  
+                    },
                 },
             },
             "ICT_Rack": {
@@ -39,7 +39,13 @@
                         "tags": [TAG.Occupancy, TAG.Sensor, TAG.Equipment, TAG.ICT],
                     },
                     "People_Count_Sensor_Equipment": {
-                        "tags": [TAG.People, TAG.Count, TAG.Sensor, TAG.Equipment, TAG.ICT],
+                        "tags": [
+                            TAG.People,
+                            TAG.Count,
+                            TAG.Sensor,
+                            TAG.Equipment,
+                            TAG.ICT,
+                        ],
                     },
                     "Thermostat_Equipment": {
                         "tags": [TAG.Thermostat, TAG.Equipment, TAG.ICT],
@@ -960,6 +966,9 @@
             },
         },
     },
+    "Freezer": {
+        "tags": [TAG.Freezer, TAG.Equipment],
+    },
     "Fume_Hood": {"tags": [TAG.Equipment, TAG.Fume, TAG.Hood]},
     "Filter": {
         "tags": [TAG.Equipment, TAG.Filter],
diff --git a/bricksrc/location.py b/bricksrc/location.py
index d0f51b14..a95033da 100644
--- a/bricksrc/location.py
+++ b/bricksrc/location.py
@@ -192,14 +192,6 @@
                     "Laboratory": {
                         "tags": [TAG.Laboratory, TAG.Room, TAG.Location],
                         "subclasses": {
-                            "Freezer": {
-                                "tags": [
-                                    TAG.Freezer,
-                                    TAG.Laboratory,
-                                    TAG.Room,
-                                    TAG.Location,
-                                ],
-                            },
                             "Cold_Box": {
                                 "tags": [
                                     TAG.Cold,