diff --git a/src/Quaazar/Utils.hs b/src/Quaazar/Utils.hs
@@ -10,13 +10,10 @@
 ----------------------------------------------------------------------------
 
 module Quaazar.Utils (
-    module Quaazar.Utils.Directory
-  , module Quaazar.Utils.Log
-  , module Quaazar.Utils.Scoped
-  , module Quaazar.Utils.TimePoint
+    module X
   ) where
 
-import Quaazar.Utils.Directory
-import Quaazar.Utils.Log
-import Quaazar.Utils.Scoped
-import Quaazar.Utils.TimePoint
+import Quaazar.Utils.Directory as X
+import Quaazar.Utils.Log as X
+import Quaazar.Utils.Scoped as X
+import Quaazar.Utils.TimePoint as X
diff --git a/src/Quaazar/Utils/Directory.hs b/src/Quaazar/Utils/Directory.hs
@@ -23,5 +23,5 @@ import System.Directory ( doesDirectoryExist, doesFileExist )
 partitionFileDir :: [FilePath] -> IO ([FilePath],[FilePath])
 partitionFileDir files = do
     (f,r) <- partitionM doesFileExist files
-    d <- fmap fst $ partitionM doesDirectoryExist r
+    d <- fst <$> partitionM doesDirectoryExist r
     return (f,d)