Cleanup, merge modules

src/Dodge/Cleat.hs

@@ -1,17 +1,17 @@
 --{-# LANGUAGE TupleSections #-}
-module Dodge.Cleat 
-    ( toLabel
-    , cleatOnward
-    , cleatSide
-    , rToOnward
-    , cleatLabel
-    ) where
-import Dodge.Data.GenWorld
-import Dodge.Tree.Compose
+module Dodge.Cleat (
+    toLabel,
+    cleatOnward,
+    cleatSide,
+    rToOnward,
+    cleatLabel,
+) where
 
-import Data.Tree
 import Control.Lens
 import qualified Data.Set as S
+import Data.Tree
+import Dodge.Data.GenWorld
+import Dodge.Tree.Compose
 
 toLabel :: Int -> Room -> Maybe Room
 toLabel i rm
@@ -19,7 +19,7 @@ toLabel i rm
     | otherwise = Nothing
 
 rToOnward :: Monad m => String -> Tree Room -> m (MetaTree Room String)
-rToOnward s t = return $ tToBTree s t
+rToOnward s = return . tToBTree s
 
 cleatOnward :: Room -> Room
 cleatOnward = rmClusterStatus . csLinks .~ S.singleton OnwardCluster