8 files changed, 38 insertions, 40 deletions
diff --git a/src/Text/Hakyll/CompressCSS.hs b/src/Text/Hakyll/CompressCSS.hs
index c8c4bcb..8745368 100644
--- a/src/Text/Hakyll/CompressCSS.hs
+++ b/src/Text/Hakyll/CompressCSS.hs
@@ -2,8 +2,8 @@ module Text.Hakyll.CompressCSS
     ( compressCSS
     ) where
 
-import Data.List
-import Text.Regex
+import Data.List (isPrefixOf)
+import Text.Regex (subRegex, mkRegex)
 
 -- | subRegex with arguments flipped for easy function composition.
 subRegex' :: String -> String -> String -> String
diff --git a/src/Text/Hakyll/File.hs b/src/Text/Hakyll/File.hs
index 5bca261..e138312 100644
--- a/src/Text/Hakyll/File.hs
+++ b/src/Text/Hakyll/File.hs
@@ -1,13 +1,13 @@
 -- | A module containing various function for manipulating and examinating
 --   files and directories.
 module Text.Hakyll.File
-    ( toDestination,
-      toCache,
-      toURL,
-      makeDirectories,
-      getRecursiveContents,
-      isCacheValid,
-      directory
+    ( toDestination
+    , toCache
+    , toURL
+    , makeDirectories
+    , getRecursiveContents
+    , isCacheValid
+    , directory
     ) where
 
 import System.Directory
diff --git a/src/Text/Hakyll/Page.hs b/src/Text/Hakyll/Page.hs
index 89e1bef..ed5f7cf 100644
--- a/src/Text/Hakyll/Page.hs
+++ b/src/Text/Hakyll/Page.hs
@@ -1,11 +1,11 @@
 module Text.Hakyll.Page 
-    ( Page,
-      fromContext,
-      getValue,
-      copyValueWith,
-      getBody,
-      readPage,
-      writePage
+    ( Page
+    , fromContext
+    , getValue
+    , copyValueWith
+    , getBody
+    , readPage
+    , writePage
     ) where
 
 import qualified Data.Map as M
diff --git a/src/Text/Hakyll/Render.hs b/src/Text/Hakyll/Render.hs
index d9dc7f5..7420d1c 100644
--- a/src/Text/Hakyll/Render.hs
+++ b/src/Text/Hakyll/Render.hs
@@ -1,18 +1,18 @@
 module Text.Hakyll.Render 
-    ( depends,
-      render,
-      renderAndConcat,
-      renderChain,
-      static,
-      css
+    ( depends
+    , render
+    , renderAndConcat
+    , renderChain
+    , static
+    , css
     ) where
 
 import Text.Template hiding (render)
 import qualified Data.ByteString.Lazy.Char8 as B
 import qualified Data.Map as M
-import Control.Monad
+import Control.Monad (unless, liftM, foldM)
 
-import System.Directory
+import System.Directory (copyFile)
 import System.IO
 
 import Text.Hakyll.Page
diff --git a/src/Text/Hakyll/Renderable.hs b/src/Text/Hakyll/Renderable.hs
index 549899c..4ca6f46 100644
--- a/src/Text/Hakyll/Renderable.hs
+++ b/src/Text/Hakyll/Renderable.hs
@@ -2,8 +2,8 @@ module Text.Hakyll.Renderable
     ( Renderable(toContext, getDependencies, getURL)
     ) where
 
-import System.FilePath
-import Text.Template
+import System.FilePath (FilePath)
+import Text.Template (Context)
 
 -- | A class for datatypes that can be rendered to pages.
 class Renderable a where
diff --git a/src/Text/Hakyll/Renderables.hs b/src/Text/Hakyll/Renderables.hs
index c79df76..996534e 100644
--- a/src/Text/Hakyll/Renderables.hs
+++ b/src/Text/Hakyll/Renderables.hs
@@ -1,14 +1,13 @@
 module Text.Hakyll.Renderables
-    ( CustomPage,
-      createCustomPage,
-      PagePath,
-      createPagePath
+    ( CustomPage
+    , createCustomPage
+    , PagePath
+    , createPagePath
     ) where
 
-import System.FilePath
+import System.FilePath (FilePath)
 import qualified Data.ByteString.Lazy.Char8 as B
 import qualified Data.Map as M
-import Control.Monad
 import Text.Hakyll.Page
 import Text.Hakyll.Renderable
 import Text.Hakyll.File
diff --git a/src/Text/Hakyll/Tags.hs b/src/Text/Hakyll/Tags.hs
index ff373eb..9cd8abd 100644
--- a/src/Text/Hakyll/Tags.hs
+++ b/src/Text/Hakyll/Tags.hs
@@ -7,11 +7,11 @@ module Text.Hakyll.Tags
 import qualified Data.Map as M
 import qualified Data.ByteString.Lazy.Char8 as B
 import qualified Data.List as L
-import Control.Monad
+import Control.Monad (foldM)
 
 import Text.Hakyll.Util
 import Text.Hakyll.Page
-import Control.Arrow
+import Control.Arrow (second)
 
 -- | Read a tag map. This creates a map from tags to page paths. This function
 --   assumes the tags are located in the `tags` metadata field, separated by
diff --git a/src/Text/Hakyll/Util.hs b/src/Text/Hakyll/Util.hs
index 7dc0ce3..d498281 100644
--- a/src/Text/Hakyll/Util.hs
+++ b/src/Text/Hakyll/Util.hs
@@ -1,12 +1,11 @@
 module Text.Hakyll.Util 
-    ( trim,
-      split,
-      stripHTML
+    ( trim
+    , split
+    , stripHTML
     ) where
 
-import Data.Char
-import Data.List
-import Text.Regex
+import Data.Char (isSpace)
+import Text.Regex (splitRegex, mkRegex)
 
 -- | Trim a string (drop spaces and tabs at both sides).
 trim :: String -> String