diff --git a/init.el b/init.el
index 9de7c0c..c874ebd 100644
--- a/init.el
+++ b/init.el
@@ -419,10 +419,6 @@
                                      face minibuffer-prompt
                                      cursor-intangible t))
 
-(setq suggest-key-bindings t
-      extended-command-suggest-shorter t
-      completions-detailed t)
-
 ;; Make M-v undo C-v
 (setq scroll-preserve-screen-position 'always)
 
@@ -511,17 +507,6 @@
               diary-show-holidays-flag t
               calendar-view-holidays-initially-flag nil))
 
-(use-package eww
-  :init (setq eww-bookmarks-directory
-              (expand-file-name "private/" emacs-d)))
-
-(use-package ffap
-  ;; Inhibit Emacs from pinging hostnames; see
-  ;; https://www.n16f.net/blog/investigating-a-ffap-issue-in-emacs/
-  :init (setq ffap-machine-p-local 'accept
-              ffap-machine-p-known 'accept
-              ffap-machine-p-unknown 'reject))
-
 (use-package grep
   :commands (rgrep zrgrep)
   :bind (:map grep-mode-map
@@ -534,9 +519,6 @@
             ;; and replace it with something more straightforward.
             (advice-add 'grep-read-files :around #'db/grep-read-files)))
 
-(use-package image
-  :init (setq image-use-external-converter t))
-
 (use-package mailcap
   :config (progn
             ;; Remove doc-view so pdf will open with default viewer
@@ -585,10 +567,6 @@
   :config (progn
             (tab-bar-history-mode +1)))
 
-(use-package tramp
-  :init (setq tramp-default-method (if on-windows "pscp" "scp")
-              tramp-completion-use-auth-sources nil))
-
 (use-package warnings
   :config (cl-pushnew '(undo discard-info) warning-suppress-types
                       :test #'equal))
@@ -2152,7 +2130,7 @@ The password is assumed to be stored at the PASSWORD property."
   :init (setq smiley-style 'emoji))
 
 
-;; * Dired
+;; * File Handling
 
 (use-package dired
   :bind (:map dired-mode-map
@@ -2267,13 +2245,6 @@ The password is assumed to be stored at the PASSWORD property."
               dired-bind-info nil
               dired-clean-up-buffers-too t))
 
-(use-package dired-subtree
-  :commands (dired-subtree-toggle))
-
-(use-package find-dired
-  :commands (find-dired)
-  :init (setq find-ls-option '("-print0 | xargs -0 ls -ld" . "-ld")))
-
 (use-package dired-open
   :ensure t
   :init (progn
@@ -2292,9 +2263,27 @@ The password is assumed to be stored at the PASSWORD property."
   :commands (dired-recent-mode
              dired-recent-open))
 
+(use-package dired-subtree
+  :commands (dired-subtree-toggle))
+
+(use-package ffap
+  ;; Inhibit Emacs from pinging hostnames; see
+  ;; https://www.n16f.net/blog/investigating-a-ffap-issue-in-emacs/
+  :init (setq ffap-machine-p-local 'accept
+              ffap-machine-p-known 'accept
+              ffap-machine-p-unknown 'reject))
+
+(use-package find-dired
+  :commands (find-dired)
+  :init (setq find-ls-option '("-print0 | xargs -0 ls -ld" . "-ld")))
+
 (use-package gnus-dired
   :commands (turn-on-gnus-dired-mode))
 
+(use-package tramp
+  :init (setq tramp-default-method (if on-windows "pscp" "scp")
+              tramp-completion-use-auth-sources nil))
+
 (use-package trashed
   ;; A simple dired-like interface to the system trash bin
   ;; Configuration taken from https://protesilaos.com/dotemacs
@@ -2306,6 +2295,10 @@ The password is assumed to be stored at the PASSWORD property."
 
 ;; * Completion
 
+(setq suggest-key-bindings t
+      extended-command-suggest-shorter t
+      completions-detailed t)
+
 (use-package helm
   :ensure t
   :diminish helm-mode
@@ -2511,6 +2504,17 @@ With given ARG, display files in `db/important-document-path’."
 
 ;; * Media
 
+(use-package db-music
+  :init (setq db/auto-playlist-file-function
+              #'(lambda ()
+                  (db/playlist-files-from-git-annex-find
+                   "--metadata db-playlist=include")))
+  :commands (db/play-auto-playlist
+             db/playlist-files-from-git-annex-find
+             db/play-auto-playlist-from-git-annex-find
+             music-control/body
+             db/update-playlist-files))
+
 (use-package emms
   :pin "melpa-stable"
   :commands (emms
@@ -2626,16 +2630,8 @@ With given ARG, display files in `db/important-document-path’."
             (require 'emms)
             (require 'helm-adaptive)))
 
-(use-package db-music
-  :init (setq db/auto-playlist-file-function
-              #'(lambda ()
-                  (db/playlist-files-from-git-annex-find
-                   "--metadata db-playlist=include")))
-  :commands (db/play-auto-playlist
-             db/playlist-files-from-git-annex-find
-             db/play-auto-playlist-from-git-annex-find
-             music-control/body
-             db/update-playlist-files))
+(use-package image
+  :init (setq image-use-external-converter t))
 
 
 ;; * Shells and such
@@ -3061,9 +3057,6 @@ With given ARG, display files in `db/important-document-path’."
 
 ;; * Other Mode Configurations
 
-;; These are external packages that are not essential, but still nice to have.
-;; They provide optional functionality and may redefine builtin commands.
-
 (use-package cperl-mode
   :ensure t
   :commands (cperl-mode)
@@ -3111,10 +3104,6 @@ With given ARG, display files in `db/important-document-path’."
                 (ignore params)
                 (list start end)))))
 
-(use-package expand-region
-  :ensure t
-  :commands (er/expand-region))
-
 (use-package eproject
   ;; This configuration is only present to inhibit eproject overriding
   ;; keybindings in `message-mode'
@@ -3125,6 +3114,14 @@ With given ARG, display files in `db/important-document-path’."
                         #'(lambda ()
                             (eproject-mode -1))))))
 
+(use-package expand-region
+  :ensure t
+  :commands (er/expand-region))
+
+(use-package eww
+  :init (setq eww-bookmarks-directory
+              (expand-file-name "private/" emacs-d)))
+
 (use-package haskell-mode
   :config (progn
             (add-hook 'haskell-mode-hook 'haskell-doc-mode)