diff --git a/bec_widgets/widgets/control/device_manager/components/available_device_resources/available_device_resources_ui.py b/bec_widgets/widgets/control/device_manager/components/available_device_resources/available_device_resources_ui.py
index d136cbc0..7522fda8 100644
--- a/bec_widgets/widgets/control/device_manager/components/available_device_resources/available_device_resources_ui.py
+++ b/bec_widgets/widgets/control/device_manager/components/available_device_resources/available_device_resources_ui.py
@@ -1,11 +1,7 @@
 from __future__ import annotations
 
 import itertools
-from functools import partial
-from typing import Generator
 
-from bec_qthemes import material_icon
-from PySide6.QtWidgets import QListWidgetItem, QWidget
 from qtpy.QtCore import QMetaObject, Qt
 from qtpy.QtWidgets import (
     QAbstractItemView,
@@ -15,6 +11,7 @@ from qtpy.QtWidgets import (
     QLineEdit,
     QListView,
     QListWidget,
+    QListWidgetItem,
     QVBoxLayout,
 )
 
diff --git a/bec_widgets/widgets/control/device_manager/components/device_table_view.py b/bec_widgets/widgets/control/device_manager/components/device_table_view.py
index 221c835b..130131f4 100644
--- a/bec_widgets/widgets/control/device_manager/components/device_table_view.py
+++ b/bec_widgets/widgets/control/device_manager/components/device_table_view.py
@@ -12,11 +12,17 @@ from uuid import uuid4
 
 from bec_lib.logger import bec_logger
 from bec_qthemes import material_icon
-from PySide6.QtCore import QPoint, QRect, QSize
-from PySide6.QtWidgets import QStyle, QStyleOption, QStyleOptionViewItem, QWidget
 from qtpy import QtCore, QtGui, QtWidgets
-from qtpy.QtCore import QModelIndex, QPersistentModelIndex, Qt, QTimer
-from qtpy.QtWidgets import QAbstractItemView, QHeaderView, QMessageBox
+from qtpy.QtCore import QModelIndex, QPersistentModelIndex, QPoint, QRect, QSize, Qt, QTimer
+from qtpy.QtWidgets import (
+    QAbstractItemView,
+    QHeaderView,
+    QMessageBox,
+    QStyle,
+    QStyleOption,
+    QStyleOptionViewItem,
+    QWidget,
+)
 from thefuzz import fuzz
 
 from bec_widgets.utils.bec_signal_proxy import BECSignalProxy
diff --git a/bec_widgets/widgets/control/device_manager/components/dm_ophyd_test.py b/bec_widgets/widgets/control/device_manager/components/dm_ophyd_test.py
index 1a460459..a8e4ee9a 100644
--- a/bec_widgets/widgets/control/device_manager/components/dm_ophyd_test.py
+++ b/bec_widgets/widgets/control/device_manager/components/dm_ophyd_test.py
@@ -12,7 +12,6 @@ from typing import Any, Iterable
 
 from bec_lib.logger import bec_logger
 from bec_qthemes import material_icon
-from PySide6.QtCore import QThreadPool
 from qtpy import QtCore, QtWidgets
 
 from bec_widgets.utils.bec_widget import BECWidget
@@ -90,7 +89,6 @@ class DeviceTester(QtCore.QRunnable):
                     fut.__dict__["__device_name"] = item
                     fut.add_done_callback(self._done_cb)
             self._safe_check_and_clear()
-
         self._cleanup()
 
     def submit(self, devices: Iterable[tuple[str, dict]]):
@@ -208,7 +206,7 @@ class DMOphydTest(BECWidget, QtWidgets.QWidget):
         else:
             self.tester = DeviceTester({})
             self.tester.signals.device_validated.connect(self._on_device_validated)
-            QThreadPool.globalInstance().start(self.tester)
+            QtCore.QThreadPool.globalInstance().start(self.tester)
         self._device_list_items: dict[str, QtWidgets.QListWidgetItem] = {}
         self._thread_pool = QtCore.QThreadPool(maxThreadCount=1)
 
diff --git a/bec_widgets/widgets/services/device_browser/device_item/device_config_dialog.py b/bec_widgets/widgets/services/device_browser/device_item/device_config_dialog.py
index 927dda1d..3cffb13b 100644
--- a/bec_widgets/widgets/services/device_browser/device_item/device_config_dialog.py
+++ b/bec_widgets/widgets/services/device_browser/device_item/device_config_dialog.py
@@ -1,17 +1,18 @@
 from ast import literal_eval
-from typing import Any, Literal
+from typing import Literal
 
 from bec_lib.atlas_models import Device as DeviceConfigModel
 from bec_lib.config_helper import CONF as DEVICE_CONF_KEYS
 from bec_lib.config_helper import ConfigHelper
 from bec_lib.logger import bec_logger
 from pydantic import BaseModel, field_validator
-from PySide6.QtWidgets import QComboBox, QHBoxLayout
 from qtpy.QtCore import QSize, Qt, QThreadPool, Signal  # type: ignore
 from qtpy.QtWidgets import (
     QApplication,
+    QComboBox,
     QDialog,
     QDialogButtonBox,
+    QHBoxLayout,
     QLabel,
     QStackedLayout,
     QVBoxLayout,