diff --git a/pkgs/clan-vm-manager/clan_vm_manager/__init__.py b/pkgs/clan-vm-manager/clan_vm_manager/__init__.py
index 54786566..8802affd 100644
--- a/pkgs/clan-vm-manager/clan_vm_manager/__init__.py
+++ b/pkgs/clan-vm-manager/clan_vm_manager/__init__.py
@@ -1,6 +1,6 @@
 import argparse
 
-from .app import register_overview_parser, show_overview, register_join_parser
+from .app import register_join_parser, register_overview_parser, show_overview
 
 
 def main() -> None:
diff --git a/pkgs/clan-vm-manager/clan_vm_manager/app.py b/pkgs/clan-vm-manager/clan_vm_manager/app.py
index a604315c..963f74e8 100644
--- a/pkgs/clan-vm-manager/clan_vm_manager/app.py
+++ b/pkgs/clan-vm-manager/clan_vm_manager/app.py
@@ -1,23 +1,27 @@
 #!/usr/bin/env python3
 import argparse
 from dataclasses import dataclass
+from typing import Optional
+
 import gi
-from typing import Callable, Optional, Type
+
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gio, Gtk
 from clan_cli.clan_uri import ClanURI
+from gi.repository import Gio, Gtk
+
 from .constants import constants
+from .interfaces import Callbacks, InitialJoinValues
 from .windows.join import JoinWindow
 from .windows.overview import OverviewWindow
-from .interfaces import Callbacks, InitialJoinValues
+
 
 @dataclass
-class ClanWindows():
+class ClanWindows:
    join: type[JoinWindow]
    overview: type[OverviewWindow]
 
 @dataclass
-class ClanConfig():
+class ClanConfig:
     initial_window: str
     url: Optional[ClanURI]
     
diff --git a/pkgs/clan-vm-manager/clan_vm_manager/interfaces.py b/pkgs/clan-vm-manager/clan_vm_manager/interfaces.py
index 14b80194..31daf811 100644
--- a/pkgs/clan-vm-manager/clan_vm_manager/interfaces.py
+++ b/pkgs/clan-vm-manager/clan_vm_manager/interfaces.py
@@ -1,13 +1,15 @@
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Callable, Optional, Type
+
 from clan_cli.clan_uri import ClanURI
 
+
 @dataclass
-class InitialJoinValues():
+class InitialJoinValues:
     url: ClanURI
 
 
 @dataclass
-class Callbacks():
+class Callbacks:
     show_list: Callable[[],None]
     show_join: Callable[[InitialJoinValues],None]
\ No newline at end of file
diff --git a/pkgs/clan-vm-manager/clan_vm_manager/windows/join.py b/pkgs/clan-vm-manager/clan_vm_manager/windows/join.py
index f0953f0f..94e7563d 100644
--- a/pkgs/clan-vm-manager/clan_vm_manager/windows/join.py
+++ b/pkgs/clan-vm-manager/clan_vm_manager/windows/join.py
@@ -1,16 +1,12 @@
-import argparse
 from typing import Any
 
 import gi
-from clan_cli.clan_uri import ClanURI
 
 from ..interfaces import Callbacks, InitialJoinValues
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gio, Gtk
-from typing import Callable
-from dataclasses import dataclass
 
+from gi.repository import Gio, Gtk
 
 
 class JoinWindow(Gtk.ApplicationWindow):
diff --git a/pkgs/clan-vm-manager/clan_vm_manager/windows/overview.py b/pkgs/clan-vm-manager/clan_vm_manager/windows/overview.py
index cd0403c4..159e2d64 100644
--- a/pkgs/clan-vm-manager/clan_vm_manager/windows/overview.py
+++ b/pkgs/clan-vm-manager/clan_vm_manager/windows/overview.py
@@ -5,7 +5,6 @@ import gi
 from ..models import VMBase
 
 gi.require_version("Gtk", "3.0")
-import argparse
 
 from gi.repository import Gio, Gtk