 
 (use-package cider-eval-sexp-fu
   :ensure t
-  :after clojure-mode
-  :init
-  (with-eval-after-load 'eval-sexp-fu (require 'cider-eval-sexp-fu)))
+  :after cider)
 
 (use-package clj-refactor
   :ensure t
   :commands clj-refactor-mode
-  :diminish clj-refactor-mode
-  :config
-  (cljr-add-keybindings-with-prefix "C-c C-m"))
+  :diminish clj-refactor-mode)
 
 (use-package cider-hydra
   :ensure t

;; Clojure
(use-package cider
  :ensure t
  :commands cider-mode
  :init
  (add-hook 'cider-mode-hook
            '(lambda ()
               (clj-refactor-mode)
               (eldoc-mode)))
  (add-hook 'cider-repl-mode-hook
            '(lambda ()
               (eldoc-mode)

  (add-hook 'clojure-mode-hook
            '(lambda ()
               (parinfer-mode)
               (clj-refactor-mode)
               (cljr-add-keybindings-with-prefix "C-c C-r .")
               (setq-local company-backends '((company-capf
                                               company-yasnippet
                                               :with
