diff --git a/Ganeti/HTools/PeerMap.hs b/Ganeti/HTools/PeerMap.hs
index 0f9af484fb79fd72adc618ec896afb1a8a13d26f..5bef2a56d0bc0af469a971381cb429a24909d0de 100644
--- a/Ganeti/HTools/PeerMap.hs
+++ b/Ganeti/HTools/PeerMap.hs
@@ -8,17 +8,15 @@ implementation should be easy in case it's needed.
 -}
 
 module Ganeti.HTools.PeerMap
-    (
-     PeerMap,
-     Key,
-     Elem,
-     empty,
-     create,
-     accumArray,
-     Ganeti.HTools.PeerMap.find,
-     add,
-     remove,
-     maxElem
+    ( PeerMap
+    , Key
+    , Elem
+    , empty
+    , accumArray
+    , Ganeti.HTools.PeerMap.find
+    , add
+    , remove
+    , maxElem
     ) where
 
 import Data.Maybe (fromMaybe)
@@ -32,12 +30,10 @@ type Key = Ndx
 type Elem = Int
 type PeerMap = [(Key, Elem)]
 
+-- | Create a new empty map
 empty :: PeerMap
 empty = []
 
-create :: Key -> PeerMap
-create _ = []
-
 -- | Our reverse-compare function
 pmCompare :: (Key, Elem) -> (Key, Elem) -> Ordering
 pmCompare a b = (compare `on` snd) b a
@@ -64,7 +60,7 @@ find :: Key -> PeerMap -> Elem
 find k c = fromMaybe 0 $ lookup k c
 
 add :: Key -> Elem -> PeerMap -> PeerMap
-add k v c = addWith (\_ n -> n) k v c
+add k v c = addWith (flip const) k v c
 
 remove :: Key -> PeerMap -> PeerMap
 remove k c = case c of
@@ -72,10 +68,7 @@ remove k c = case c of
                (x@(x', _)):xs -> if k == x' then xs
                             else x:(remove k xs)
 
-to_list :: PeerMap -> [Elem]
-to_list c = snd $ unzip c
-
+-- | Find the maximum element. Since this is a sorted list, we just
+-- get the first one
 maxElem :: PeerMap -> Elem
-maxElem c = case c of
-              [] -> 0
-              (_, v):_ -> v
+maxElem c = if null c then 0 else snd . head $ c