diff --git a/bootstrap.el b/bootstrap.el
index 213a96b7f..bcfb4c7a5 100644
--- a/bootstrap.el
+++ b/bootstrap.el
@@ -1,5 +1,4 @@
 ;;; bootstrap.el
-
 (eval-when-compile (require 'cl-lib))
 
 ;; Global constants
@@ -31,7 +30,6 @@
 
 (eval-when-compile
   (defvar doom--load-path load-path)
-
   ;; Helper for traversing subdirectories recursively
   (defun --subdirs (path &optional include-self)
     (let ((result (if include-self (list path) (list))))
@@ -53,12 +51,10 @@
   "Bootstrap DOOM emacs and initialize PACKAGES"
   (setq-default gc-cons-threshold 4388608
                 gc-cons-percentage 0.4)
-
   ;; prematurely optimize for faster startup
   (let ((gc-cons-threshold 339430400)
         (gc-cons-percentage 0.6)
         file-name-handler-alist)
-
     ;; Scan various folders to populate the load-paths
     (setq load-path
           (eval-when-compile
diff --git a/core/core-evil.el b/core/core-evil.el
index 4fed7386f..6a818e744 100644
--- a/core/core-evil.el
+++ b/core/core-evil.el
@@ -161,12 +161,12 @@
                             ("S" (shell-quote-argument path))
                             (t path))
                           "")))
-                (setq file-name
-                      (replace-regexp-in-string (format "\\(?:^\\|[^\\\\]\\)\\(%s\\)"
-                                                        (string-trim-left (car match)))
-                                                path file-name t t 1)))))
-          ;; Clean up
-          (setq file-name (replace-regexp-in-string regexp "\\1" file-name t)))))
+              (setq file-name
+                    (replace-regexp-in-string (format "\\(?:^\\|[^\\\\]\\)\\(%s\\)"
+                                                      (string-trim-left (car match)))
+                                              path file-name t t 1)))))
+        ;; Clean up
+        (setq file-name (replace-regexp-in-string regexp "\\1" file-name t)))))
 
   ;; Extra argument types for highlight buffer (or global) regexp matches
   (evil-ex-define-argument-type buffer-match :runner doom/evil-ex-buffer-match)
diff --git a/core/core-ui.el b/core/core-ui.el
index 600b69c11..3fc8a5cbd 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -52,13 +52,6 @@
 (load-theme doom-current-theme t)
 (tooltip-mode -1) ; show tooltips in echo area
 
-;; standardize fringe width
-(push `(left-fringe  . ,doom-fringe-size) default-frame-alist)
-(push `(right-fringe . ,doom-fringe-size) default-frame-alist)
-;; Default frame size on startup
-(push '(width . 120) default-frame-alist)
-(push '(height . 32) default-frame-alist)
-
 ;; set up minibuffer and fringe
 (if (not window-system)
     (menu-bar-mode -1)
@@ -69,6 +62,12 @@
   ;; set fonts
   (set-frame-font doom-default-font t)
   (set-face-attribute 'default t :font doom-current-font)
+  ;; standardize fringe width
+  (push `(left-fringe  . ,doom-fringe-size) default-frame-alist)
+  (push `(right-fringe . ,doom-fringe-size) default-frame-alist)
+  ;; Default frame size on startup
+  (push '(width . 120) default-frame-alist)
+  (push '(height . 32) default-frame-alist)
   ;; no fringe in the minibuffer
   (add-hook! after-init (set-window-fringes (minibuffer-window) 0 0 nil))
   ;; Show tilde in margin on empty lines