diff --git a/lib/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart b/lib/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart
index 818c872..4ee8f81 100644
--- a/lib/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart
+++ b/lib/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart
@@ -170,26 +170,18 @@ class DeviceManagerBloc extends Bloc<DeviceManagerEvent, DeviceManagerState> {
   }
 
   List<DeviceModel> _getOnlyImplementedDevices(List<DeviceModel> devices) {
-    List<DeviceModel> implementedDevices = [];
-
-    const allowedDevices = <DeviceType>{
-      DeviceType.OneGang,
-      DeviceType.TwoGang,
-      DeviceType.ThreeGang,
+    const allowedDeviceTypes = {
       DeviceType.AC,
       DeviceType.DoorLock,
       DeviceType.Gateway,
       DeviceType.WallSensor,
-      DeviceType.CeilingSensor
+      DeviceType.CeilingSensor,
+      DeviceType.ThreeGang,
+      DeviceType.OneGang,
     };
 
-    for (final device in devices) {
-      final isDeviceAllowed = allowedDevices.contains(device.productType);
-      if (isDeviceAllowed) {
-        implementedDevices.add(device);
-      }
-      return implementedDevices;
-    }
-    return implementedDevices;
+    return devices
+        .where((device) => allowedDeviceTypes.contains(device.productType))
+        .toList();
   }
 }