diff --git a/src/common/mod.rs b/src/common/mod.rs
index a9443d2..c3af5ce 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -3,7 +3,6 @@ pub mod consts;
 use crate::common::consts::*;
 use smash::app::{self, lua_bind::*};
 use smash::lib::lua_const::*;
-// use smash::app::{FighterManager, FighterInformation};
 use smash::hash40;
 
 pub static mut menu_struct: consts::TrainingModpackMenu = consts::TrainingModpackMenu {
diff --git a/src/hitbox_visualizer/mod.rs b/src/hitbox_visualizer/mod.rs
index bdc9d80..f80c87b 100644
--- a/src/hitbox_visualizer/mod.rs
+++ b/src/hitbox_visualizer/mod.rs
@@ -1,12 +1,7 @@
-use crate::common::*;
-use crate::common::consts::*;
-use smash::app::lua_bind::*;
-use smash::app::sv_animcmd::{self};
-use smash::app::sv_system::{self};
-use smash::app::{self};
+use crate::common::{*, consts::*};
+use smash::app::{self, lua_bind::*, sv_animcmd, sv_system};
 use smash::hash40;
-use smash::lib::lua_const::*;
-use smash::lib::{L2CAgent, L2CValue};
+use smash::lib::{lua_const::*, L2CAgent, L2CValue};
 use smash::phx::{Hash40, Vector3f};
 
 /**
diff --git a/src/lib.rs b/src/lib.rs
index 1c88f58..307349c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -17,7 +17,7 @@ use skyline::c_str;
 use skyline::libc::{c_void, mkdir, fclose, fopen, fwrite};
 use skyline::nro::{self, NroInfo};
 use smash::app::lua_bind::*;
-use smash::app::sv_system::{self};
+use smash::app::sv_system;
 use smash::lib::lua_const::*;
 use smash::lib::L2CValue;
 use smash::lua2cpp::L2CFighterCommon;
diff --git a/src/training/DirectionalInfluence.rs b/src/training/DirectionalInfluence.rs
index b04b010..267e0be 100644
--- a/src/training/DirectionalInfluence.rs
+++ b/src/training/DirectionalInfluence.rs
@@ -1,8 +1,7 @@
 use crate::common::consts::*;
 use crate::common::*;
 use core::f64::consts::PI;
-use smash::app::lua_bind::*;
-use smash::app::{self};
+use smash::app::{self, lua_bind::*};
 use smash::hash40;
 use smash::lib::lua_const::*;
 
diff --git a/src/training/Ledge.rs b/src/training/Ledge.rs
index 19f9cfe..3e2a92e 100644
--- a/src/training/Ledge.rs
+++ b/src/training/Ledge.rs
@@ -1,7 +1,6 @@
 use crate::common::consts::*;
 use crate::common::*;
-use smash::app::lua_bind::*;
-use smash::app::{self};
+use smash::app::{self, lua_bind::*};
 use smash::hash40;
 use smash::lib::lua_const::*;
 
diff --git a/src/training/Mash.rs b/src/training/Mash.rs
index 5f68fbd..3437802 100644
--- a/src/training/Mash.rs
+++ b/src/training/Mash.rs
@@ -1,7 +1,6 @@
 use crate::common::consts::*;
 use crate::common::*;
-use smash::app::lua_bind::*;
-use smash::app::{self};
+use smash::app::{self, lua_bind::*};
 use smash::hash40;
 use smash::lib::lua_const::*;
 
diff --git a/src/training/SaveStates.rs b/src/training/SaveStates.rs
index 951e297..cf7a655 100644
--- a/src/training/SaveStates.rs
+++ b/src/training/SaveStates.rs
@@ -1,6 +1,5 @@
 use crate::common::*;
-use smash::app::lua_bind::*;
-use smash::app::{self};
+use smash::app::{self, lua_bind::*};
 use smash::lib::lua_const::*;
 use smash::phx::Vector3f;
 
diff --git a/src/training/Shield.rs b/src/training/Shield.rs
index a2cb9a4..b387f6a 100644
--- a/src/training/Shield.rs
+++ b/src/training/Shield.rs
@@ -1,6 +1,6 @@
 use crate::common::consts::*;
 use crate::common::*;
-use smash::app::{self};
+use smash::app;
 use smash::hash40;
 use smash::lib::lua_const::*;
 
diff --git a/src/training/Tech.rs b/src/training/Tech.rs
index 8b9d177..f20dab5 100644
--- a/src/training/Tech.rs
+++ b/src/training/Tech.rs
@@ -1,7 +1,6 @@
 use crate::common::consts::*;
 use crate::common::*;
-use smash::app::lua_bind::*;
-use smash::app::{self};
+use smash::app::{self, lua_bind::*};
 use smash::hash40;
 use smash::lib::lua_const::*;