diff --git a/boon-moves.el b/boon-moves.el
index 0c6722b..0fcccd9 100644
--- a/boon-moves.el
+++ b/boon-moves.el
@@ -173,10 +173,9 @@ line."
   (interactive)
   (if mark-active
       (exchange-point-and-mark)
-    (if (mark)
-        (progn
-          (goto-char (mark))
-          (pop-mark)))))
+    (when (mark)
+      (goto-char (mark))
+      (pop-mark))))
 
 (defun boon-switch-mark-quick ()
   "Pop the mark ring until we find ourselves on a different line."