diff --git a/src/data_manager.rs b/src/data_manager.rs
index 6d62648..8abe4fb 100644
--- a/src/data_manager.rs
+++ b/src/data_manager.rs
@@ -1,14 +1,14 @@
-use {
-	async_sqlite :: {
-		* ,
-		Error :: * ,
-		rusqlite :: { OpenFlags , Row , Error :: * , ffi :: ErrorCode :: * } ,
-	} ,
-	fallible_iterator :: * ,
-	std :: path :: * ,
-} ;
+use async_sqlite :: * ;
+use async_sqlite :: Error :: * ;
+use async_sqlite :: rusqlite :: OpenFlags ;
+use async_sqlite :: rusqlite :: Row ;
+use async_sqlite :: rusqlite :: Error :: * ;
+use async_sqlite :: rusqlite :: ffi :: ErrorCode :: * ;
+use fallible_iterator :: * ;
+use std :: path :: * ;
 
-use crate :: error :: { * , ZoodexError :: * } ;
+use crate :: error :: * ;
+use crate :: error :: ZoodexError :: * ;
 
 
 
diff --git a/src/error.rs b/src/error.rs
index 0de1aec..6e9867f 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,4 +1,6 @@
-use std :: { * , any :: * , future :: * } ;
+use std :: * ;
+use std :: any :: * ;
+use std :: future :: * ;
 
 
 
diff --git a/src/main.rs b/src/main.rs
index 93c57fd..fabd4ad 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,17 +3,18 @@ mod data_manager ;
 mod ui ;
 mod utility ;
 
-use {
-	gtk4 :: {
-		CssProvider ,
-		style_context_add_provider_for_display ,
-		STYLE_PROVIDER_PRIORITY_APPLICATION ,
-		gdk :: * ,
-		glib :: * ,
-	} ,
-	libadwaita :: { * , prelude :: * } } ;
+use gtk4 :: CssProvider ;
+use gtk4 :: style_context_add_provider_for_display ;
+use gtk4 :: STYLE_PROVIDER_PRIORITY_APPLICATION ;
+use gtk4 :: gdk :: * ;
+use gtk4 :: glib :: * ;
+use libadwaita :: * ;
+use libadwaita :: prelude :: * ;
 
-use crate :: { data_manager :: * , error :: { * , ZoodexError :: * } , ui :: * } ;
+use crate :: data_manager :: * ;
+use crate :: error :: * ;
+use crate :: error :: ZoodexError :: * ;
+use crate :: ui :: * ;
 
 
 
@@ -36,8 +37,8 @@ fn add_style_provider ( _ : & Application ) {
 	) ;
 }
 
-fn show_window ( app : & Application ) {
-	let ui = UI :: new (app) ;
+fn show_window ( application : & Application ) {
+	let ui = UI :: new (application) ;
 	ui . show_window () ;
 
 	spawn_future_local ( async move {
diff --git a/src/ui/application_header_bar.rs b/src/ui/application_header_bar.rs
index 87108f6..7db3785 100644
--- a/src/ui/application_header_bar.rs
+++ b/src/ui/application_header_bar.rs
@@ -1,6 +1,9 @@
-use libadwaita :: { * , ViewSwitcherPolicy :: * } ;
+use libadwaita :: * ;
+use libadwaita :: ViewSwitcherPolicy :: * ;
 
-use crate :: ui :: { collection_view_stack :: * , component :: * , utility :: * } ;
+use crate :: ui :: collection_view_stack :: * ;
+use crate :: ui :: component :: * ;
+use crate :: ui :: utility :: * ;
 
 
 
diff --git a/src/ui/collatable_container/collated_grid.rs b/src/ui/collatable_container/collated_grid.rs
index a50a624..8be037d 100644
--- a/src/ui/collatable_container/collated_grid.rs
+++ b/src/ui/collatable_container/collated_grid.rs
@@ -1,17 +1,18 @@
-use {
-	gtk4 :: {
-		* ,
-		Align :: * ,
-		Orientation :: * ,
-		gdk :: * ,
-		gio :: * ,
-		pango :: { * , Weight :: * } ,
-		prelude :: * ,
-	} ,
-	std :: { cell :: * , iter :: * , path :: { Path , PathBuf } } ,
-} ;
+use gtk4 :: * ;
+use gtk4 :: Align :: * ;
+use gtk4 :: Orientation :: * ;
+use gtk4 :: gdk :: * ;
+use gtk4 :: gio :: * ;
+use gtk4 :: pango :: * ;
+use gtk4 :: pango :: Weight :: * ;
+use gtk4 :: prelude :: * ;
+use std :: cell :: * ;
+use std :: iter :: * ;
+use std :: path :: Path ;
+use std :: path :: PathBuf ;
 
-use crate :: ui :: { collatable_container :: * , component :: * } ;
+use crate :: ui :: collatable_container :: * ;
+use crate :: ui :: component :: * ;
 
 
 
diff --git a/src/ui/collatable_container/collation_menu/mod.rs b/src/ui/collatable_container/collation_menu/mod.rs
index ec9374f..1264d71 100644
--- a/src/ui/collatable_container/collation_menu/mod.rs
+++ b/src/ui/collatable_container/collation_menu/mod.rs
@@ -1,15 +1,15 @@
 mod sort_button ;
 
-use {
-	gtk4 :: { Box , Align :: * , Orientation :: * , prelude :: * } ,
-	std :: ops :: * ,
-} ;
+use gtk4 :: Box ;
+use gtk4 :: Align :: * ;
+use gtk4 :: Orientation :: * ;
+use gtk4 :: prelude :: * ;
+use std :: ops :: * ;
 
-use crate :: ui :: {
-	component :: * ,
-	utility :: * ,
-	collatable_container :: { * , collation_menu :: sort_button :: * } ,
-} ;
+use crate :: ui :: component :: * ;
+use crate :: ui :: utility :: * ;
+use crate :: ui :: collatable_container :: * ;
+use crate :: ui :: collatable_container :: collation_menu :: sort_button :: * ;
 
 
 
diff --git a/src/ui/collatable_container/collation_menu/sort_button.rs b/src/ui/collatable_container/collation_menu/sort_button.rs
index 7c58bd4..c1954c6 100644
--- a/src/ui/collatable_container/collation_menu/sort_button.rs
+++ b/src/ui/collatable_container/collation_menu/sort_button.rs
@@ -1,13 +1,13 @@
-use {
-	gtk4 :: { Image , ListBoxRow , Align :: * } ,
-	libadwaita :: * ,
-	std :: cell :: * ,
-} ;
+use gtk4 :: Image ;
+use gtk4 :: ListBoxRow ;
+use gtk4 :: Align :: * ;
+use libadwaita :: * ;
+use std :: cell :: * ;
 
-use crate :: {
-	utility :: * ,
-	ui :: { * , utility :: * , collatable_container :: SortingDirection :: * } ,
-} ;
+use crate :: utility :: * ;
+use crate :: ui :: * ;
+use crate :: ui :: utility :: * ;
+use crate :: ui :: collatable_container :: SortingDirection :: * ;
 
 
 
diff --git a/src/ui/collatable_container/mod.rs b/src/ui/collatable_container/mod.rs
index 69c0eec..d6105b0 100644
--- a/src/ui/collatable_container/mod.rs
+++ b/src/ui/collatable_container/mod.rs
@@ -1,16 +1,16 @@
 mod collated_grid ;
 mod collation_menu ;
 
-use gtk4 :: { * , Orientation :: * , prelude :: * } ;
+use gtk4 :: * ;
+use gtk4 :: Orientation :: * ;
+use gtk4 :: prelude :: * ;
 
-use crate :: {
-	data_manager :: * ,
-	ui :: {
-		component :: * , utility :: * ,
-		collatable_container :: { collated_grid :: * , collation_menu :: * } ,
-	} ,
-	utility :: * ,
-} ;
+use crate :: data_manager :: * ;
+use crate :: ui :: component :: * ;
+use crate :: ui :: utility :: * ;
+use crate :: ui :: collatable_container :: collated_grid :: * ;
+use crate :: ui :: collatable_container :: collation_menu :: * ;
+use crate :: utility :: * ;
 
 
 
diff --git a/src/ui/collection_view_stack.rs b/src/ui/collection_view_stack.rs
index af0666c..2fe2496 100644
--- a/src/ui/collection_view_stack.rs
+++ b/src/ui/collection_view_stack.rs
@@ -1,6 +1,8 @@
 use libadwaita :: * ;
 
-use crate :: ui :: { collatable_container :: * , component :: * , utility :: * } ;
+use crate :: ui :: collatable_container :: * ;
+use crate :: ui :: component :: * ;
+use crate :: ui :: utility :: * ;
 
 
 
diff --git a/src/ui/component.rs b/src/ui/component.rs
index a7c324f..a7fda8f 100644
--- a/src/ui/component.rs
+++ b/src/ui/component.rs
@@ -1,4 +1,5 @@
-use gtk4 :: { * , prelude :: * } ;
+use gtk4 :: * ;
+use gtk4 :: prelude :: * ;
 
 
 
diff --git a/src/ui/mod.rs b/src/ui/mod.rs
index f6390ba..c81b319 100644
--- a/src/ui/mod.rs
+++ b/src/ui/mod.rs
@@ -4,21 +4,16 @@ mod collection_view_stack ;
 mod component ;
 mod utility ;
 
-use {
-	gtk4 :: { Orientation :: * , prelude :: * } ,
-	libadwaita :: * ,
-} ;
+use gtk4 :: Orientation :: * ;
+use gtk4 :: prelude :: * ;
+use libadwaita :: * ;
 
-use crate :: {
-	data_manager :: * ,
-	ui :: {
-		application_header_bar :: * ,
-		collatable_container :: * ,
-		collection_view_stack :: * ,
-		component :: * ,
-		utility :: * ,
-	} ,
-} ;
+use crate :: data_manager :: * ;
+use crate :: ui :: application_header_bar :: * ;
+use crate :: ui :: collatable_container :: * ;
+use crate :: ui :: collection_view_stack :: * ;
+use crate :: ui :: component :: * ;
+use crate :: ui :: utility :: * ;