diff --git a/src/Haboli/Euphoria.hs b/src/Haboli/Euphoria.hs
index 968c565..aa3e32f 100644
--- a/src/Haboli/Euphoria.hs
+++ b/src/Haboli/Euphoria.hs
@@ -1,11 +1,19 @@
--- | This module just reexports all euphoria-related modules for convenience.
--- For more detail on how this library works, check the "Haboli.Euphoria.Client"
+-- | This module reexports the most commonly used modules for convenience. For
+-- more detail on how this library works, check the "Haboli.Euphoria.Client"
 -- module's documentation.
 
 module Haboli.Euphoria
-  ( module Haboli.Euphoria.Client
-  , module Haboli.Euphoria.Api
+  ( module Haboli.Euphoria.Api
+  , module Haboli.Euphoria.Client
+  , module Haboli.Euphoria.Command
+  , module Haboli.Euphoria.Command.Simple
+  , module Haboli.Euphoria.Listing
+  , module Haboli.Euphoria.Util
   ) where
 
 import           Haboli.Euphoria.Api
 import           Haboli.Euphoria.Client
+import           Haboli.Euphoria.Command
+import           Haboli.Euphoria.Command.Simple
+import           Haboli.Euphoria.Listing
+import           Haboli.Euphoria.Util
diff --git a/src/Haboli/Euphoria/ExampleBot.hs b/src/Haboli/Euphoria/ExampleBot.hs
index bee6152..3929499 100644
--- a/src/Haboli/Euphoria/ExampleBot.hs
+++ b/src/Haboli/Euphoria/ExampleBot.hs
@@ -10,13 +10,9 @@ module Haboli.Euphoria.ExampleBot
 import           Control.Monad
 import           Control.Monad.Trans.Class
 import           Control.Monad.Trans.State
-import qualified Data.Text                      as T
+import qualified Data.Text                 as T
 
 import           Haboli.Euphoria
-import           Haboli.Euphoria.Command
-import           Haboli.Euphoria.Command.Simple
-import           Haboli.Euphoria.Listing
-import           Haboli.Euphoria.Util
 
 newtype BotState = BotState
   { botListing :: Listing