diff --git a/src/client.rs b/src/client.rs
index fad3665..a1e8c19 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -1,13 +1,17 @@
-use crate::{tcp, Packet};
-use bevy::prelude::*;
-use std::{collections::HashMap, io, net::ToSocketAddrs, sync::Arc};
+use std::collections::HashMap;
+use std::io;
+use std::net::ToSocketAddrs;
+use std::sync::Arc;
 
+use bevy::prelude::*;
 #[cfg(feature = "sync")]
-use ::{
+use {
     serde::{de::DeserializeOwned, Serialize},
     std::{any::type_name, marker::PhantomData},
 };
 
+use crate::{tcp, Packet};
+
 /// A trait for a handler function.
 pub trait PacketHandlerFn: Fn(Vec<u8>, &mut World) + Send + Sync + 'static {}
 
diff --git a/src/lib.rs b/src/lib.rs
index f9849ca..6abcd64 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,8 +1,8 @@
-use serde::{de::DeserializeOwned, Serialize};
-use std::{
-    collections::hash_map::DefaultHasher,
-    hash::{Hash, Hasher},
-};
+use std::collections::hash_map::DefaultHasher;
+use std::hash::{Hash, Hasher};
+
+use serde::de::DeserializeOwned;
+use serde::Serialize;
 
 #[cfg(feature = "client")]
 pub mod client;
diff --git a/src/server.rs b/src/server.rs
index f8421c6..be2cfe6 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -1,13 +1,17 @@
-use crate::{tcp, Packet};
-use bevy::prelude::*;
-use std::{collections::HashMap, io, net::ToSocketAddrs, sync::Arc};
+use std::collections::HashMap;
+use std::io;
+use std::net::ToSocketAddrs;
+use std::sync::Arc;
 
+use bevy::prelude::*;
 #[cfg(feature = "sync")]
-use ::{
+use {
     serde::{de::DeserializeOwned, Serialize},
     std::{any::type_name, marker::PhantomData, ops::Deref},
 };
 
+use crate::{tcp, Packet};
+
 /// A trait for a handler function.
 pub trait PacketHandlerFn:
     Fn(Entity, ClientConnection, Vec<u8>, &mut World) + Send + Sync + 'static
diff --git a/src/tcp.rs b/src/tcp.rs
index 0905256..66bf170 100644
--- a/src/tcp.rs
+++ b/src/tcp.rs
@@ -1,16 +1,11 @@
-use std::{
-    io::{self, Read, Write},
-    net::{Shutdown, TcpStream, ToSocketAddrs},
-    sync::{
-        atomic::{AtomicBool, Ordering},
-        mpsc::{channel, Receiver, Sender},
-        Arc, Mutex,
-    },
-    thread,
-};
-
+use std::io::{self, Read, Write};
 #[cfg(feature = "server")]
 use std::net::TcpListener;
+use std::net::{Shutdown, TcpStream, ToSocketAddrs};
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::mpsc::{channel, Receiver, Sender};
+use std::sync::{Arc, Mutex};
+use std::thread;
 
 /// A non-blocking TCP connection.
 pub struct Connection {