diff --git a/elisp/extras.el b/elisp/extras.el
index 1fba925..32e03ca 100644
--- a/elisp/extras.el
+++ b/elisp/extras.el
@@ -29,8 +29,15 @@
 
 ;; Org
 (use-package org
-  :config
-  (load "~/.emacs.d/elisp/org-setup.el"))
+  ;; The following binds are always needed. Why?
+  :bind (("\C-cl" . 'org-store-link)
+         ("\C-ca" . 'org-agenda)
+         ("\C-cc" . 'org-capture))
+  :hook ((org-shiftup-final . windmove-up)
+         (org-shiftleft-final . windmove-left)
+         (org-shiftdown-final-hook . windmove-down)
+         (org-shiftright-final . windmove-right))
+  :config (load "~/.emacs.d/elisp/org-setup.el"))
 (use-package org-ref)
 
 ;; Writing
@@ -157,10 +164,8 @@
 
 (use-package eglot
   :straight (:type built-in)
-  :ensure t
   :defer t
-  :hook ((python-base-mode . eglot-ensure))
-  )
+  :hook ((python-base-mode . eglot-ensure)))
 
 (use-package dape)
 
diff --git a/elisp/org-setup.el b/elisp/org-setup.el
index 1283c97..04e391c 100644
--- a/elisp/org-setup.el
+++ b/elisp/org-setup.el
@@ -1,29 +1,15 @@
-;; The following lines are always needed. Choose your own keys.
-;; Org mode keys
-(global-set-key "\C-cl" 'org-store-link)
-(global-set-key "\C-ca" 'org-agenda)
-(global-set-key "\C-cc" 'org-capture)
-(global-set-key "\C-cb" 'org-iswitchb)
-
-;; Make windmove work in Org mode:
-(add-hook 'org-shiftup-final-hook 'windmove-up)
-(add-hook 'org-shiftleft-final-hook 'windmove-left)
-(add-hook 'org-shiftdown-final-hook 'windmove-down)
-(add-hook 'org-shiftright-final-hook 'windmove-right)
-
 ;; open org file with everything folded
-(setq org-startup-folded t)
-
-;; preserve indentation on output
-(setq org-src-preserve-indentation t)
-
-;; some config for org-babel
-(setq org-confirm-babel-evaluate nil
+(setq org-startup-folded t
+      ;; preserve indentation on output
+      org-src-preserve-indentation t
+      ;; some config for org-babel
+      org-confirm-babel-evaluate nil
       org-src-fontify-natively t
       org-src-tab-acts-natively t
       org-hide-emphasis-markers t
       org-babel-python-command "python3")
 
+
 ;; load languages babel
 (org-babel-do-load-languages
  'org-babel-load-languages
@@ -39,21 +25,15 @@
 
 ;; default apps to open files with org-mode
 (setq org-file-apps
-   (quote
-    ((auto-mode . emacs)
+    '((auto-mode . emacs)
      ("\\.mm\\'" . default)
      ("\\.pdf\\'" . "emacsclient %s")
-     ("\\.djvu\\'" . "djview %s"))))
+     ("\\.djvu\\'" . "djview %s")))
 
 ;; define sequence of TODO keywords
 (setq org-todo-keywords
   '((sequence "TODO" "IN PROGRESS" "|" "DONE")))
 
-;; (setq reftex-default-bibliography '("~/repos/csphy/pesquisa/vis.bib"))
-;; (setq org-ref-bibliography-notes "~/repos/csphy/pesquisa/paper-notes.org"
-;;       org-ref-default-bibliography '("~/repos/csphy/pesquisa/vis.bib")
-;;       org-ref-pdf-directory "~/repos/csphy/pesquisa/vis")
-
 ;; Use biber to process bibtex
 (setq org-latex-pdf-process
       '("xelatex -interaction nonstopmode -output-directory %o %f"