diff --git a/Network/IRC/Conduit.hs b/Network/IRC/Conduit.hs
--- a/Network/IRC/Conduit.hs
+++ b/Network/IRC/Conduit.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes        #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- |
 -- Module      : Network.IRC.Conduit
@@ -58,26 +58,33 @@
     , module Network.IRC.Conduit.Lens
     ) where
 
-import Control.Applicative      ((*>))
-import Control.Concurrent       (newMVar, takeMVar, putMVar, threadDelay)
-import Control.Concurrent.Async (Concurrently(..))
-import Control.Monad            (when)
-import Control.Monad.IO.Class   (MonadIO, liftIO)
-import Data.ByteString          (ByteString)
-import Data.Conduit             (ConduitM, (.|), awaitForever, yield, runConduit)
-import Data.Conduit.Network     (AppData, clientSettings, runTCPClient, appSource, appSink)
-import Data.Conduit.Network.TLS (TLSClientConfig(..), tlsClientConfig, runTLSClient)
-import Data.Monoid              ((<>))
-import Data.Text                (unpack)
-import Data.Text.Encoding       (decodeUtf8)
-import Data.Time.Clock          (NominalDiffTime, getCurrentTime, addUTCTime, diffUTCTime)
-import Data.Void                (Void)
-import Data.X509.Validation     (FailedReason(..))
-import Network.Connection       (TLSSettings(..))
-import Network.IRC.Conduit.Internal
-import Network.IRC.Conduit.Lens
-import Network.TLS              (ClientParams(..), ClientHooks(..), Supported(..), Version(..), defaultParamsClient)
-import Network.TLS.Extra        (ciphersuite_strong)
+import           Control.Applicative          ((*>))
+import           Control.Concurrent           (newMVar, putMVar, takeMVar,
+                                               threadDelay)
+import           Control.Concurrent.Async     (Concurrently(..))
+import           Control.Monad                (when)
+import           Control.Monad.IO.Class       (MonadIO, liftIO)
+import           Data.ByteString              (ByteString)
+import           Data.Conduit                 (ConduitM, awaitForever,
+                                               runConduit, yield, (.|))
+import           Data.Conduit.Network         (AppData, appSink, appSource,
+                                               clientSettings, runTCPClient)
+import           Data.Conduit.Network.TLS     (TLSClientConfig(..),
+                                               runTLSClient, tlsClientConfig)
+import           Data.Monoid                  ((<>))
+import           Data.Text                    (unpack)
+import           Data.Text.Encoding           (decodeUtf8)
+import           Data.Time.Clock              (NominalDiffTime, addUTCTime,
+                                               diffUTCTime, getCurrentTime)
+import           Data.Void                    (Void)
+import           Data.X509.Validation         (FailedReason(..))
+import           Network.Connection           (TLSSettings(..))
+import           Network.IRC.Conduit.Internal
+import           Network.IRC.Conduit.Lens
+import           Network.TLS                  (ClientHooks(..),
+                                               ClientParams(..), Supported(..),
+                                               Version(..), defaultParamsClient)
+import           Network.TLS.Extra            (ciphersuite_strong)
 
 -- *Conduits
 
diff --git a/Network/IRC/Conduit/Internal.hs b/Network/IRC/Conduit/Internal.hs
--- a/Network/IRC/Conduit/Internal.hs
+++ b/Network/IRC/Conduit/Internal.hs
@@ -1,8 +1,8 @@
-{-# LANGUAGE BangPatterns      #-}
-{-# LANGUAGE DeriveFunctor     #-}
+{-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE DeriveFunctor #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes        #-}
-{-# LANGUAGE TupleSections     #-}
+{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE TupleSections #-}
 
 -- |
 -- Module      : Network.IRC.Conduit.Internal
@@ -16,17 +16,19 @@
 -- considered to form part of the public interface of this library.
 module Network.IRC.Conduit.Internal where
 
-import Control.Applicative ((<$>))
-import Control.Arrow       ((&&&))
-import Data.ByteString     (ByteString, isSuffixOf, singleton, unpack)
-import Data.Char           (ord)
-import Data.Conduit        (ConduitM, await, yield)
-import Data.Maybe          (listToMaybe, isJust)
-import Data.Monoid         ((<>))
-import Data.Profunctor (Choice)
-import Data.String         (fromString)
-import Network.IRC.CTCP    (CTCPByteString, getUnderlyingByteString, orCTCP)
-import Text.Read           (readMaybe)
+import           Control.Applicative   ((<$>))
+import           Control.Arrow         ((&&&))
+import           Data.ByteString       (ByteString, isSuffixOf, singleton,
+                                        unpack)
+import           Data.Char             (ord)
+import           Data.Conduit          (ConduitM, await, yield)
+import           Data.Maybe            (isJust, listToMaybe)
+import           Data.Monoid           ((<>))
+import           Data.Profunctor       (Choice)
+import           Data.String           (fromString)
+import           Network.IRC.CTCP      (CTCPByteString, getUnderlyingByteString,
+                                        orCTCP)
+import           Text.Read             (readMaybe)
 
 import qualified Data.ByteString       as B
 import qualified Data.ByteString.Char8 as B8
diff --git a/Network/IRC/Conduit/Lens.hs b/Network/IRC/Conduit/Lens.hs
--- a/Network/IRC/Conduit/Lens.hs
+++ b/Network/IRC/Conduit/Lens.hs
@@ -9,11 +9,12 @@
 -- 'Lens'es and 'Prism's.
 module Network.IRC.Conduit.Lens where
 
-import Data.ByteString (ByteString)
-import Data.Profunctor (Choice (right'), Profunctor (dimap))
+import           Data.ByteString              (ByteString)
+import           Data.Profunctor              (Choice(right'),
+                                               Profunctor(dimap))
 
-import Network.IRC.CTCP (CTCPByteString)
-import Network.IRC.Conduit.Internal
+import           Network.IRC.CTCP             (CTCPByteString)
+import           Network.IRC.Conduit.Internal
 
 -- * Lenses for 'Event'
 
diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,2 +1,2 @@
-import Distribution.Simple
+import           Distribution.Simple
 main = defaultMain
diff --git a/irc-conduit.cabal b/irc-conduit.cabal
--- a/irc-conduit.cabal
+++ b/irc-conduit.cabal
@@ -10,7 +10,7 @@
 -- PVP summary:      +-+------- breaking API changes
 --                   | | +----- non-breaking API additions
 --                   | | | +--- code changes with no API change
-version:             0.3.0.4
+version:             0.3.0.5
 
 -- A short (one-line) description of the package.
 synopsis:            Streaming IRC message library using conduits.
@@ -108,4 +108,4 @@
 source-repository this
   type:     git
   location: https://github.com/barrucadu/irc-conduit.git
-  tag:      0.3.0.4
+  tag:      0.3.0.5