     (values entries truncate-p)))
 
 (defun* lusty-display-entries (entries truncated-p)
+
   (when (endp entries)
     (lusty-print-no-entries)
     (return-from lusty-display-entries))
 
-  ; STEVE clean up this
-  (setq entries
-        (loop with len = (length entries)
-              with highlighted-index = (mod lusty--highlighted-index len)
-              for e in entries
-              for i from 0
-              when (= i highlighted-index)
-              collect (propertize e 'face lusty-match-face)
-              else
-              collect (lusty-propertize-path e)))
-
-  (loop for column-count downfrom (lusty-column-count-upperbound entries)
-        ;; FIXME this is calculated one too many times in the degenerate
-        ;; case.
-        for columns = (lusty-columnize entries column-count)
-        for widths = (mapcar 'lusty-longest-length columns)
-        for full-width = (+ (reduce '+ widths)
-                            (* (length lusty-column-separator)
-                               (1- column-count)))
-        until (or (<= column-count 1)
-                  (< full-width (window-width)))
-        finally
-        (when (<= column-count 1)
-          (setq columns (list entries)
-                widths (list 0)))
-        (lusty-print-columns columns widths))
+  (let ((propertized
+         ; Add font faces to the entries
+         (loop with len = (length entries)
+               with highlighted-index = (mod lusty--highlighted-index len)
+               for e in entries
+               for i from 0
+               when (= i highlighted-index)
+               collect (propertize e 'face lusty-match-face)
+               else
+               collect (lusty-propertize-path e))))
+
+    (loop for column-count downfrom (lusty-column-count-upperbound propertized)
+          ;; FIXME this is calculated one too many times in the degenerate
+          ;; case.
+          for columns = (lusty-columnize propertized column-count)
+          for widths = (mapcar 'lusty-longest-length columns)
+          for full-width = (+ (reduce '+ widths)
+                              (* (length lusty-column-separator)
+                                 (1- column-count)))
+          until (or (<= column-count 1)
+                    (< full-width (window-width)))
+          finally
+          (when (<= column-count 1)
+            (setq columns (list propertized)
+                  widths (list 0)))
+          (lusty-print-columns columns widths)))
 
   (when truncated-p
     (lusty-print-truncated)))

        (save-window-excursion
          (funcall read-fn ">> "))
      (remove-hook 'post-command-hook 'lusty--post-command-function)
      (setq lusty--previous-contents nil
            lusty--initial-window-config nil))))

(provide 'lusty-explorer)

;;; lusty-explorer.el ends here.

    ;; STEVE ^ entry for <Enter> as well?
    map)
  "Minibuffer keymap for `lusty-file-explorer' and `lusty-buffer-explorer'.")

;;;###autoload
(defun lusty-file-explorer ()
