diff --git a/init.el b/init.el
index b420b6a..6e677db 100644
--- a/init.el
+++ b/init.el
@@ -1,3 +1,22 @@
+(setq
+ straight-profiles `((nil . ,(expand-file-name "straight.lock.el" user-emacs-directory)))
+ straight-use-package-by-default t)
+
+(let ((bootstrap-file
+       (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
+      (bootstrap-version 5))
+  (unless (file-exists-p bootstrap-file)
+    (with-current-buffer
+        (url-retrieve-synchronously
+         "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
+         'silent 'inhibit-cookies)
+      (goto-char (point-max))
+      (eval-print-last-sexp)))
+  (load bootstrap-file nil 'nomessage))
+
+(straight-use-package 'use-package)
+
 ;; Load bootstrap.org for actual setup
+(use-package org-contrib)
 (org-babel-load-file
  (locate-user-emacs-file (convert-standard-filename "uno/bootstrap.org")))
diff --git a/uno/bootstrap.org b/uno/bootstrap.org
index 1190cc8..ec8716f 100644
--- a/uno/bootstrap.org
+++ b/uno/bootstrap.org
@@ -53,37 +53,13 @@ Isolate or remove backup files for a clean structure.
     tramp-persistency-file-name (uno-cache-path "tramp/history"))
 #+END_SRC
 
-* Straight + Use Package
+* General
 
-Run bootstrap code for =straight= and have =use-package= ready.
+Set up generic and leader key binds that are used throughout. =general= is loaded first to set up integration with =evil= before setting up =general=.
 
 #+BEGIN_SRC emacs-lisp
-  (setq
-   straight-profiles `((nil . ,(uno-emacs-path "straight.lock.el")))
-   straight-use-package-by-default t)
-
-  (let ((bootstrap-file
-         (uno-emacs-path "straight/repos/straight.el/bootstrap.el"))
-        (bootstrap-version 5))
-    (unless (file-exists-p bootstrap-file)
-      (with-current-buffer
-          (url-retrieve-synchronously
-           "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
-           'silent 'inhibit-cookies)
-        (goto-char (point-max))
-        (eval-print-last-sexp)))
-    (load bootstrap-file nil 'nomessage))
-
-  (straight-use-package 'use-package)
-
   (use-package general)
-#+END_SRC
 
-* General
-
-Set up general and leader key binds that are used throughout.
-
-#+BEGIN_SRC emacs-lisp
   (use-package evil
     :custom
     (evil-want-keybinding nil)
@@ -120,6 +96,8 @@ Set up general and leader key binds that are used throughout.
 
 * Modules
 
+Traverse through modules and load each one.
+
 #+BEGIN_SRC emacs-lisp
   (let* ((uno-module-directory (uno-path "modules/"))
          (uno-module-files (directory-files-recursively
diff --git a/uno/modules/doc/org.org b/uno/modules/doc/org.org
index 6e9eebc..f10e5b5 100644
--- a/uno/modules/doc/org.org
+++ b/uno/modules/doc/org.org
@@ -17,7 +17,6 @@ Define Org document package.
 #+BEGIN_SRC emacs-lisp
   (use-package org
     :after uno-doc-org
-    :ensure org-plus-contrib
     :custom
     (org-adapt-indentation nil)
     (org-ellipsis " ▼")
@@ -71,13 +70,9 @@ Define Org document package.
           '(org-level-6 ((t (:inherit outline-6 :height 1.15)))))))
     :config
     (require 'ox-beamer)
+    (require 'ox-groff)
     (require 'ox-md))
 
-  (use-package org-contrib
-    :after (uno-doc-org org)
-    :config
-    (require 'ox-groff))
-
   (use-package org-superstar
     :if (display-graphic-p)
     :after (uno-doc-org org)