diff --git a/modules/editor/evil/autoload/evil.el b/modules/editor/evil/autoload/evil.el
index e5d0690be..06b266cea 100644
--- a/modules/editor/evil/autoload/evil.el
+++ b/modules/editor/evil/autoload/evil.el
@@ -1,5 +1,4 @@
 ;; editor/evil/autoload/evil.el -*- lexical-binding: t; -*-
-;;;###if (featurep! :editor evil)
 
 ;;;###autodef
 (defun set-evil-initial-state! (modes state)
diff --git a/modules/editor/multiple-cursors/config.el b/modules/editor/multiple-cursors/config.el
index 408c2576f..cd958382a 100644
--- a/modules/editor/multiple-cursors/config.el
+++ b/modules/editor/multiple-cursors/config.el
@@ -2,17 +2,26 @@
 
 (def-package! evil-mc
   :when (featurep! :editor evil)
-  :commands (evil-mc-make-cursor-here evil-mc-make-all-cursors
-             evil-mc-undo-all-cursors evil-mc-pause-cursors
-             evil-mc-resume-cursors evil-mc-make-and-goto-first-cursor
+  :commands (evil-mc-make-cursor-here
+             evil-mc-make-all-cursors
+             evil-mc-undo-all-cursors
+             evil-mc-pause-cursors
+             evil-mc-resume-cursors
+             evil-mc-make-and-goto-first-cursor
              evil-mc-make-and-goto-last-cursor
              evil-mc-make-cursor-move-next-line
-             evil-mc-make-cursor-move-prev-line evil-mc-make-cursor-at-pos
-             evil-mc-has-cursors-p evil-mc-make-and-goto-next-cursor
-             evil-mc-skip-and-goto-next-cursor evil-mc-make-and-goto-prev-cursor
-             evil-mc-skip-and-goto-prev-cursor evil-mc-make-and-goto-next-match
-             evil-mc-skip-and-goto-next-match evil-mc-skip-and-goto-next-match
-             evil-mc-make-and-goto-prev-match evil-mc-skip-and-goto-prev-match)
+             evil-mc-make-cursor-move-prev-line
+             evil-mc-make-cursor-at-pos
+             evil-mc-has-cursors-p
+             evil-mc-make-and-goto-next-cursor
+             evil-mc-skip-and-goto-next-cursor
+             evil-mc-make-and-goto-prev-cursor
+             evil-mc-skip-and-goto-prev-cursor
+             evil-mc-make-and-goto-next-match
+             evil-mc-skip-and-goto-next-match
+             evil-mc-skip-and-goto-next-match
+             evil-mc-make-and-goto-prev-match
+             evil-mc-skip-and-goto-prev-match)
   :init
   (defvar evil-mc-key-map (make-sparse-keymap))
   :config
diff --git a/modules/editor/snippets/config.el b/modules/editor/snippets/config.el
index 4bcc60f25..0a753603c 100644
--- a/modules/editor/snippets/config.el
+++ b/modules/editor/snippets/config.el
@@ -8,8 +8,13 @@
 ;; Packages
 
 (def-package! yasnippet
-  :commands (yas-minor-mode-on yas-expand yas-expand-snippet yas-lookup-snippet
-             yas-insert-snippet yas-new-snippet yas-visit-snippet-file)
+  :commands (yas-minor-mode-on
+             yas-expand
+             yas-expand-snippet
+             yas-lookup-snippet
+             yas-insert-snippet
+             yas-new-snippet
+             yas-visit-snippet-file)
   :init
   ;; Ensure `yas-reload-all' is called as late as possible. Other modules could
   ;; have additional configuration for yasnippet. For example, file-templates.
@@ -22,7 +27,8 @@
   (setq yas-verbosity (if doom-debug-mode 3 0)
         yas-also-auto-indent-first-line t
         ;; Remove default ~/.emacs.d/snippets
-        yas-snippet-dirs (delete yas--default-user-snippets-dir yas-snippet-dirs))
+        yas-snippet-dirs (delete yas--default-user-snippets-dir
+                                 yas-snippet-dirs))
 
   ;; default snippets library, if available
   (require 'doom-snippets nil t)
@@ -31,7 +37,7 @@
   (add-to-list 'yas-snippet-dirs '+snippets-dir nil #'eq)
 
   ;; Remove GUI dropdown prompt (prefer ivy/helm)
-  (setq yas-prompt-functions (delq 'yas-dropdown-prompt yas-prompt-functions))
+  (delq! 'yas-dropdown-prompt yas-prompt-functions)
   ;; Prioritize private snippets in `+snippets-dir' over built-in ones if there
   ;; are multiple choices.
   (add-to-list 'yas-prompt-functions #'+snippets-prompt-private nil #'eq)
diff --git a/modules/ui/vc-gutter/config.el b/modules/ui/vc-gutter/config.el
index 387d8ac5e..b39a9994a 100644
--- a/modules/ui/vc-gutter/config.el
+++ b/modules/ui/vc-gutter/config.el
@@ -20,7 +20,7 @@ to the right fringe.")
 ;; Packages
 
 (def-package! git-gutter
-  :commands (git-gutter:revert-hunk git-gutter:stage-hunk)
+  :commands git-gutter:revert-hunk git-gutter:stage-hunk
   :init
   (add-hook! '(text-mode-hook prog-mode-hook conf-mode-hook)
     (defun +vc-gutter-init-maybe-h ()