diff --git a/init.el b/init.el
index 607ea68..8fc4852 100644
--- a/init.el
+++ b/init.el
@@ -96,13 +96,15 @@
   ;; Load modules.
   ;; --------------------------------------------------------------------------
 
-  (init-packages/init '(editing
+  (init-packages/init '(
+                        editing
                         emacs
                         helm
                         parentheses
                         programming
                         version-control
-                        workflow))
+                        workflow
+                        ))
 
 
   ;; *********************************************************************** ;;
diff --git a/modules/emacs.el b/modules/emacs.el
index e051442..48734d3 100644
--- a/modules/emacs.el
+++ b/modules/emacs.el
@@ -62,7 +62,7 @@
   ;; Key-bindings -------------------------------------------------------------
 
   ;; Kill other window (cyclic order).
-  (global-set-key (kbd "C-x C-q") 'quit-other-window)
+  (global-set-key (kbd "C-z") 'quit-other-window)
 
   ;; Kill current buffer without prompting.
   (global-set-key (kbd "C-x k") 'kill-default-buffer)
@@ -116,7 +116,7 @@
                   " "
                   (mode 16 16 :left :elide)
                   " "
-                  (vc-(setq )tatus 16 16 :left)
+                  (vc-status 16 16 :left)
                   " "
                   filename-and-process))))
 
diff --git a/modules/version-control.el b/modules/version-control.el
index f2cff04..9b8a5ad 100644
--- a/modules/version-control.el
+++ b/modules/version-control.el
@@ -90,11 +90,14 @@
 
   ;; Key-bindings -------------------------------------------------------------
 
-  ;; This shadows new global key-binding for other-window.
-  (define-key diff-mode-map (kbd "M-o") nil)
+  (use-package diff-mode
+    :config
 
-  ;; This copies behaviour from other modes where C-o displays the relevant
-  ;; source in another window.
-  (define-key diff-mode-map (kbd "C-o") 'x-diff-display-source)
+    ;; This shadows new global key-binding for other-window.
+    (define-key diff-mode-map (kbd "M-o") nil)
+
+    ;; This copies behaviour from other modes where C-o displays the relevant
+    ;; (setq )ource in another window.
+    (define-key diff-mode-map (kbd "C-o") 'x-diff-display-source))
 
   )