diff --git a/src/api/packets.rs b/src/api/packets.rs
index e269b9e..6326a4c 100644
--- a/src/api/packets.rs
+++ b/src/api/packets.rs
@@ -5,7 +5,7 @@
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
-use crate::error::{self, Error};
+use crate::Error;
 
 use super::PacketType;
 
@@ -229,7 +229,7 @@ impl ParsedPacket {
         }
     }
 
-    pub fn into_data(self) -> error::Result<Data> {
+    pub fn into_data(self) -> crate::Result<Data> {
         self.content.map_err(Error::Euph)
     }
 
diff --git a/src/client/conn.rs b/src/client/conn.rs
index a0fbf1e..ec92689 100644
--- a/src/client/conn.rs
+++ b/src/client/conn.rs
@@ -13,8 +13,8 @@ use tokio_tungstenite::tungstenite::{
 use crate::{
     api::{Command, Data, ParsedPacket},
     conn::{Conn, ConnConfig, Side},
-    error::{Error, Result},
     replies::{self, PendingReply, Replies},
+    Error, Result,
 };
 
 use super::state::State;
diff --git a/src/conn.rs b/src/conn.rs
index a566512..28b05f0 100644
--- a/src/conn.rs
+++ b/src/conn.rs
@@ -17,7 +17,7 @@ use tokio_tungstenite::{
 
 use crate::{
     api::{Data, Packet, PacketType, ParsedPacket, Ping, PingEvent, PingReply, Time},
-    error::{Error, Result},
+    Error, Result,
 };
 
 /// Which side of the connection we're on.
diff --git a/src/lib.rs b/src/lib.rs
index 5b75f2e..368ad1b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,8 +2,8 @@ pub mod api;
 pub mod client;
 pub mod conn;
 mod emoji;
-pub mod error;
+mod error;
 pub mod nick;
 mod replies;
 
-pub use crate::emoji::Emoji;
+pub use crate::{emoji::*, error::*};