diff --git a/src/Main.hs b/src/Main.hs
index fe23008..33ae567 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -12,9 +12,9 @@ import qualified Data.ByteString.Lazy.Char8 as Lazy (
     fromStrict, intercalate, split, toStrict, writeFile
   )
 import qualified Data.Map as Map (insert, lookup)
-import PDF (AllLayers(..), Document(..), UnifiedLayers(..), parseDocument, render)
-import PDF.Box (I(..), (.@), edit, modifyAt)
-import PDF.Layer (AllObjects(..))
+import PDF (Layers(..), Document(..), UnifiedLayers(..), parseDocument, render)
+import PDF.Box (I(..), at, atAll, edit)
+import PDF.Layer (Objects(..))
 import PDF.Object (DirectObject(..), Object(..), Name(..), Number(..))
 import PDF.TextRendering (TextRendering(..), update)
 import Prelude hiding (lines, unlines)
@@ -44,17 +44,17 @@ revealObject obj@(Stream {header, streamContent}) =
 revealObject obj = obj
 
 reveal :: Document -> Document
-reveal = execState $ do
-  modifyAt (UnifiedLayers .@ AllObjects) (return . fmap revealObject)
+reveal = execState $
+  edit .at UnifiedLayers .atAll Objects $ return . revealObject
 
 revealFirst :: Document -> Document
-revealFirst document = maybe document id $ execStateT (do
-    modifyAt (AllLayers .@ I 0 .@ AllObjects) (return . fmap revealObject)
+revealFirst document = maybe document id $ execStateT (
+    edit .at Layers .at(I 0) .atAll Objects $ return . revealObject
   ) document
 
 deepReveal :: Document -> Document
-deepReveal = execState $ do
-  modifyAt AllLayers (mapM . edit AllObjects $ return . fmap revealObject)
+deepReveal = execState $
+  edit .atAll Layers .atAll Objects $ return . revealObject
 
 main :: IO ()
 main = do