diff --git a/XMonad/Actions/Launcher.hs b/XMonad/Actions/Launcher.hs
index 46a9155f..0857f11e 100644
--- a/XMonad/Actions/Launcher.hs
+++ b/XMonad/Actions/Launcher.hs
@@ -62,7 +62,7 @@ type ExtensionActions = M.Map String (String -> X())
 instance XPrompt CalculatorMode where
   showXPrompt CalcMode = "calc %s> "
   commandToComplete CalcMode = id --send the whole string to `calc`
-  completionFunction CalcMode = \s -> if (length s == 0) then return [] else do
+  completionFunction CalcMode = \s -> if (length s == 0) then return [] else
     lines <$> runProcessWithInput "calc" [s] ""
   modeAction CalcMode _ _ = return () -- do nothing; this might copy the result to the clipboard
 
@@ -88,7 +88,7 @@ instance XPrompt HoogleMode where
 
 -- | Creates an autocompletion function for a programm given the program's name and a list of args to send to the command.
 completionFunctionWith :: String -> [String] -> IO [String]
-completionFunctionWith cmd args = do lines <$> runProcessWithInput cmd args ""
+completionFunctionWith cmd args = lines <$> runProcessWithInput cmd args ""
 
 -- | Creates a prompt with the given modes
 launcherPrompt :: XPConfig -> [XPMode] -> X()
diff --git a/XMonad/Actions/MouseResize.hs b/XMonad/Actions/MouseResize.hs
index fd04fb06..b16b5343 100644
--- a/XMonad/Actions/MouseResize.hs
+++ b/XMonad/Actions/MouseResize.hs
@@ -105,7 +105,7 @@ handleResize st ButtonEvent { ev_window = ew, ev_event_type = et }
 handleResize _ _ = return ()
 
 createInputWindow :: ((Window,Rectangle), Maybe Rectangle) -> X ((Window,Rectangle),Maybe Window)
-createInputWindow ((w,r),mr) = do
+createInputWindow ((w,r),mr) =
   case mr of
     Just tr  -> withDisplay $ \d -> do
                   tw <- mkInputWindow d tr
diff --git a/XMonad/Actions/WindowNavigation.hs b/XMonad/Actions/WindowNavigation.hs
index 81273916..7a82cf49 100644
--- a/XMonad/Actions/WindowNavigation.hs
+++ b/XMonad/Actions/WindowNavigation.hs
@@ -136,11 +136,11 @@ withTargetWindow adj posRef dir = fromCurrentPoint posRef $ \win pos -> do
       setPosition posRef pos targetRect
 
 trackMovement :: IORef WNState -> X ()
-trackMovement posRef = fromCurrentPoint posRef $ \win pos -> do
+trackMovement posRef = fromCurrentPoint posRef $ \win pos ->
                            windowRect win >>= flip whenJust (setPosition posRef pos . snd)
 
 fromCurrentPoint :: IORef WNState -> (Window -> Point -> X ()) -> X ()
-fromCurrentPoint posRef f = withFocused $ \win -> do
+fromCurrentPoint posRef f = withFocused $ \win ->
                                 currentPosition posRef >>= f win
 
 -- Gets the current position from the IORef passed in, or if nothing (say, from
diff --git a/XMonad/Actions/WorkspaceNames.hs b/XMonad/Actions/WorkspaceNames.hs
index 80e73893..17eae7db 100644
--- a/XMonad/Actions/WorkspaceNames.hs
+++ b/XMonad/Actions/WorkspaceNames.hs
@@ -110,8 +110,7 @@ getWorkspaceName w = ($ w) <$> getWorkspaceNames'
 
 -- | Gets the name of the current workspace. See 'getWorkspaceName'
 getCurrentWorkspaceName :: X (Maybe String)
-getCurrentWorkspaceName = do
-    getWorkspaceName =<< gets (W.currentTag . windowset)
+getCurrentWorkspaceName = getWorkspaceName =<< gets (W.currentTag . windowset)
 
 -- | Sets the name of a workspace. Empty string makes the workspace unnamed
 -- again.
@@ -129,7 +128,7 @@ setCurrentWorkspaceName name = do
 
 -- | Prompt for a new name for the current workspace and set it.
 renameWorkspace :: XPConfig -> X ()
-renameWorkspace conf = do
+renameWorkspace conf =
     mkXPrompt pr conf (const (return [])) setCurrentWorkspaceName
     where pr = Wor "Workspace name: "
 
diff --git a/XMonad/Hooks/EwmhDesktops.hs b/XMonad/Hooks/EwmhDesktops.hs
index aba242fb..6ef4f083 100644
--- a/XMonad/Hooks/EwmhDesktops.hs
+++ b/XMonad/Hooks/EwmhDesktops.hs
@@ -145,14 +145,14 @@ ewmhDesktopsLogHookCustom f = withWindowSet $ \s -> do
     -- Remap the current workspace to handle any renames that f might be doing.
     let maybeCurrent' = W.tag <$> listToMaybe (f [W.workspace $ W.current s])
         current = join (flip elemIndex (map W.tag ws) <$> maybeCurrent')
-    whenChanged (CurrentDesktop $ fromMaybe 0 current) $ do
+    whenChanged (CurrentDesktop $ fromMaybe 0 current) $
         mapM_ setCurrentDesktop current
 
     -- Set window-desktop mapping
     let windowDesktops =
           let f wsId workspace = M.fromList [ (winId, wsId) | winId <- W.integrate' $ W.stack workspace ]
           in M.unions $ zipWith f [0..] ws
-    whenChanged (WindowDesktops windowDesktops) $ do
+    whenChanged (WindowDesktops windowDesktops) $
         mapM_ (uncurry setWindowDesktop) (M.toList windowDesktops)
 
     -- Set active window
@@ -201,13 +201,13 @@ handle f (ClientMessageEvent {
                if 0 <= n && fi n < length ws then
                        windows $ W.shiftWin (W.tag (ws !! fi n)) w
                  else  trace $ "Bad _NET_DESKTOP with data[0]="++show n
-        else if mt == a_aw then do
+        else if mt == a_aw then
                windows $ W.focusWindow w
-        else if mt == a_cw then do
+        else if mt == a_cw then
                killWindow w
-        else if mt `elem` a_ignore then do
+        else if mt `elem` a_ignore then
            return ()
-        else do
+        else
           -- The Message is unknown to us, but that is ok, not all are meant
           -- to be handled by the window manager
           return ()
diff --git a/XMonad/Hooks/ManageDocks.hs b/XMonad/Hooks/ManageDocks.hs
index 94c9b632..3c6cb725 100644
--- a/XMonad/Hooks/ManageDocks.hs
+++ b/XMonad/Hooks/ManageDocks.hs
@@ -104,11 +104,11 @@ instance ExtensionClass StrutCache where
   initialValue = StrutCache M.empty
 
 updateStrutCache :: Window -> [Strut] -> X Bool
-updateStrutCache w strut = do
+updateStrutCache w strut =
   XS.modified $ StrutCache . M.insert w strut . fromStrutCache
 
 deleteFromStructCache :: Window -> X Bool
-deleteFromStructCache w = do
+deleteFromStructCache w =
   XS.modified $ StrutCache . M.delete w . fromStrutCache
 
 -- | Detects if the given window is of type DOCK and if so, reveals
@@ -116,7 +116,7 @@ deleteFromStructCache w = do
 manageDocks :: ManageHook
 manageDocks = checkDock --> (doIgnore <+> setDocksMask)
     where setDocksMask = do
-            ask >>= \win -> liftX $ withDisplay $ \dpy -> do
+            ask >>= \win -> liftX $ withDisplay $ \dpy ->
                 io $ selectInput dpy win (propertyChangeMask .|. structureNotifyMask)
             mempty
 
diff --git a/XMonad/Hooks/PositionStoreHooks.hs b/XMonad/Hooks/PositionStoreHooks.hs
index 7d02fb52..ba428607 100644
--- a/XMonad/Hooks/PositionStoreHooks.hs
+++ b/XMonad/Hooks/PositionStoreHooks.hs
@@ -99,7 +99,7 @@ positionStoreInit mDecoTheme w  = withDisplay $ \d -> do
 
 positionStoreEventHook :: Event -> X All
 positionStoreEventHook (DestroyWindowEvent {ev_window = w, ev_event_type = et}) = do
-    when (et == destroyNotify) $ do
+    when (et == destroyNotify) $
         modifyPosStore (\ps -> posStoreRemove ps w)
     return (All True)
 positionStoreEventHook _ = return (All True)
diff --git a/XMonad/Hooks/UrgencyHook.hs b/XMonad/Hooks/UrgencyHook.hs
index 5b36a9e2..e598459c 100644
--- a/XMonad/Hooks/UrgencyHook.hs
+++ b/XMonad/Hooks/UrgencyHook.hs
@@ -356,7 +356,7 @@ handleEvent :: UrgencyHook h => WithUrgencyHook h -> Event -> X ()
 handleEvent wuh event =
     case event of
      -- WM_HINTS urgency flag
-      PropertyEvent { ev_event_type = t, ev_atom = a, ev_window = w } -> do
+      PropertyEvent { ev_event_type = t, ev_atom = a, ev_window = w } ->
           when (t == propertyNotify && a == wM_HINTS) $ withDisplay $ \dpy -> do
               WMHints { wmh_flags = flags } <- io $ getWMHints dpy w
               if (testBit flags urgencyHintBit) then markUrgent w else markNotUrgent w
diff --git a/XMonad/Layout/AutoMaster.hs b/XMonad/Layout/AutoMaster.hs
index 370f7a99..6760bbfb 100644
--- a/XMonad/Layout/AutoMaster.hs
+++ b/XMonad/Layout/AutoMaster.hs
@@ -73,7 +73,7 @@ autoLayout k bias wksp rect = do
     let n = length ws
     if null ws then
         runLayout wksp rect
-        else do
+        else
           if (n<=k) then
               return ((divideRow rect ws),Nothing)
               else do
diff --git a/XMonad/Layout/Decoration.hs b/XMonad/Layout/Decoration.hs
index 99876efb..9f07314b 100644
--- a/XMonad/Layout/Decoration.hs
+++ b/XMonad/Layout/Decoration.hs
@@ -319,7 +319,7 @@ handleMouseFocusDrag ds (DS dwrs _) ButtonEvent { ev_window     = ew
             distFromLeft = ex - fi dx
             distFromRight = fi dwh - (ex - fi dx)
         dealtWith <- decorationCatchClicksHook ds mainw (fi distFromLeft) (fi distFromRight)
-        when (not dealtWith) $ do
+        when (not dealtWith) $
             mouseDrag (\x y -> focus mainw >> decorationWhileDraggingHook ds ex ey (mainw, r) x y)
                         (decorationAfterDraggingHook ds (mainw, r) ew)
 handleMouseFocusDrag _ _ _ = return ()
diff --git a/XMonad/Layout/DragPane.hs b/XMonad/Layout/DragPane.hs
index 720eaee0..fe870c71 100644
--- a/XMonad/Layout/DragPane.hs
+++ b/XMonad/Layout/DragPane.hs
@@ -81,14 +81,14 @@ handleMess d@(DragPane mb@(I (Just (win,_,ident))) ty delta split) x
     -- layout specific messages
     | Just Shrink <- fromMessage x = return $ Just (DragPane mb ty delta (split - delta))
     | Just Expand <- fromMessage x = return $ Just (DragPane mb ty delta (split + delta))
-    | Just (SetFrac ident' frac) <- fromMessage x, ident' == ident = do
+    | Just (SetFrac ident' frac) <- fromMessage x, ident' == ident =
                                      return $ Just (DragPane mb ty delta frac)
 handleMess _ _ = return Nothing
 
 handleEvent :: DragPane a -> Event -> X ()
 handleEvent (DragPane (I (Just (win,r,ident))) ty _ _)
             (ButtonEvent {ev_window = thisw, ev_subwindow = thisbw, ev_event_type = t })
-    | t == buttonPress && thisw == win || thisbw == win  = do
+    | t == buttonPress && thisw == win || thisbw == win  =
   mouseDrag (\ex ey -> do
              let frac = case ty of
                         Vertical   -> (fromIntegral ex - (fromIntegral $ rect_x r))/(fromIntegral $ rect_width  r)
diff --git a/XMonad/Layout/Master.hs b/XMonad/Layout/Master.hs
index d51e4049..b5668b6e 100644
--- a/XMonad/Layout/Master.hs
+++ b/XMonad/Layout/Master.hs
@@ -113,7 +113,7 @@ applyMaster f k _ frac wksp rect = do
     let st= S.stack wksp
     let ws = S.integrate' $ st
     let n = length ws + fromEnum f
-    if n > 1 then do
+    if n > 1 then
         if(n<=k) then
              return ((divideCol rect ws), Nothing)
              else do
diff --git a/XMonad/Layout/PositionStoreFloat.hs b/XMonad/Layout/PositionStoreFloat.hs
index b9a415b3..abdac261 100644
--- a/XMonad/Layout/PositionStoreFloat.hs
+++ b/XMonad/Layout/PositionStoreFloat.hs
@@ -65,7 +65,7 @@ instance LayoutClass PositionStoreFloat Window where
                             Just changedRect -> (w, changedRect)
             let wrs' = focused : wrs
             let paintOrder' = nub (w : paintOrder)
-            when (isJust maybeChange) $ do
+            when (isJust maybeChange) $
                 updatePositionStore focused sr
             return (reorder wrs' paintOrder', Just $ PSF (Nothing, paintOrder'))
         where
diff --git a/XMonad/Prompt.hs b/XMonad/Prompt.hs
index 86ab1fe1..dc994d83 100644
--- a/XMonad/Prompt.hs
+++ b/XMonad/Prompt.hs
@@ -525,7 +525,7 @@ mkXPromptWithModes modes conf = do
       om = XPMultipleModes modeStack
   st' <- mkXPromptImplementation (showXPrompt defaultMode) conf { alwaysHighlight = True } om
   if successful st'
-    then do
+    then
       case operationMode st' of
         XPMultipleModes ms -> let
           action = modeAction $ W.focus ms
@@ -595,7 +595,7 @@ runXP st = do
     (grabKeyboard d w True grabModeAsync grabModeAsync currentTime)
     (\_ -> ungrabKeyboard d currentTime)
     (\status ->
-      (flip execStateT st $ do
+      (flip execStateT st $
         when (status == grabSuccess) $ do
           updateWindows
           eventLoop handleMain evDefaultStop)
@@ -772,7 +772,7 @@ handleInputSubmap :: XP ()
                   -> KeyMask
                   -> KeyStroke
                   -> XP ()
-handleInputSubmap defaultAction keymap keymask (keysym,keystr) = do
+handleInputSubmap defaultAction keymap keymask (keysym,keystr) =
     case M.lookup (keymask,keysym) keymap of
         Just action -> action >> updateWindows
         Nothing     -> unless (null keystr) $ defaultAction >> updateWindows
@@ -829,7 +829,7 @@ handleInputBuffer :: (String -> String -> (Bool,Bool))
                   -> KeyStroke
                   -> Event
                   -> XP ()
-handleInputBuffer f keymask (keysym,keystr) event = do
+handleInputBuffer f keymask (keysym,keystr) event =
     unless (null keystr || keymask .&. controlMask /= 0) $ do
         (evB,inB) <- gets (eventBuffer &&& inputBuffer)
         let keystr' = utf8Decode keystr
diff --git a/XMonad/Util/NamedScratchpad.hs b/XMonad/Util/NamedScratchpad.hs
index 07af0a84..6aec3f03 100644
--- a/XMonad/Util/NamedScratchpad.hs
+++ b/XMonad/Util/NamedScratchpad.hs
@@ -136,7 +136,7 @@ someNamedScratchpadAction f confs n
                                         ((maybe [] W.integrate . W.stack . W.workspace . W.current) s)
                      filterAll <- filterM (runQuery (query conf)) (W.allWindows s)
                      case filterCurrent of
-                       [] -> do
+                       [] ->
                          case filterAll of
                            [] -> runApplication conf
                            _  -> f (windows . W.shiftWin (W.currentTag s)) filterAll