diff --git a/modules/module-js.el b/modules/module-js.el
index 79d51143a..cf91dce07 100644
--- a/modules/module-js.el
+++ b/modules/module-js.el
@@ -65,19 +65,19 @@
 
   ;; [pedantry intensifies]
   (defadvice js2-mode (after js2-mode-rename-modeline activate)
-    (setq mode-name "JS2"))
+    (setq mode-name "JS2")))
 
-  (define-minor-mode nodejs-mode
-    :lighter " node" :keymap (make-sparse-keymap)
-    (add-yas-minor-mode! 'nodejs-mode))
-  (associate! nodejs-mode :files ("package.json") :in (js2-mode))
+(define-minor-mode nodejs-mode
+  :lighter " node" :keymap (make-sparse-keymap)
+  (add-yas-minor-mode! 'nodejs-mode))
+(associate! nodejs-mode :files ("package.json") :in (js2-mode))
 
-  (define-minor-mode electron-mode
-    :lighter " electron" :keymap (make-sparse-keymap)
-    (add-yas-minor-mode! 'electron-mode))
-  (associate! nodejs-mode
-    :files ("package.json" "app/index.html" "app/main.js")
-    :in (web-mode js2-mode markdown-mode json-mode coffee-mode)))
+(define-minor-mode electron-mode
+  :lighter " electron" :keymap (make-sparse-keymap)
+  (add-yas-minor-mode! 'electron-mode))
+(associate! electron-mode
+  :files ("package.json" "app/index.html" "app/main.js")
+  :in (web-mode js2-mode markdown-mode json-mode coffee-mode))
 
 (use-package tern
   :commands tern-mode
diff --git a/modules/module-ruby.el b/modules/module-ruby.el
index bb06fb269..e8102359d 100644
--- a/modules/module-ruby.el
+++ b/modules/module-ruby.el
@@ -41,28 +41,29 @@
             (refactor-extract-constant        "extract constant"        t)
             (refactor-add-parameter           "add parameter"           nil)
             (refactor-extract-to-let          "extract to let"          t)
-            (refactor-convert-post-conditional "convert post conditional" t))))
+            (refactor-convert-post-conditional "convert post conditional" t)))))
 
-  ;; Rakefiles ;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  (define-minor-mode rake-mode
-    "Buffer local minor mode for rake files"
-    :lighter " Rake" :keymap (make-sparse-keymap)
-    (add-yas-minor-mode! 'rake-mode))
-  (associate! rake-mode :match "\\(/Rakefile\\|\\.rake\\)$")
+;; Rakefiles ;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(define-minor-mode rake-mode
+  "Buffer local minor mode for rake files"
+  :lighter " Rake" :keymap (make-sparse-keymap)
+  (add-yas-minor-mode! 'rake-mode))
+(associate! rake-mode :match "\\(/Rakefile\\|\\.rake\\)$")
+(associate! rake-mode :files ("Rakefile"))
 
-  ;; Vagrantfiles ;;;;;;;;;;;;;;;;;;;;;;;;
-  (define-minor-mode vagrant-mode
-    "Buffer local minor mode for vagrant files"
-    :lighter " Va" :keymap (make-sparse-keymap)
-    (add-yas-minor-mode! 'vagrant-mode))
-  (associate! vagrant-mode :match "/Vagrantfile$"))
+;; Vagrantfiles ;;;;;;;;;;;;;;;;;;;;;;;;
+(define-minor-mode vagrant-mode
+  "Buffer local minor mode for vagrant files"
+  :lighter " Va" :keymap (make-sparse-keymap)
+  (add-yas-minor-mode! 'vagrant-mode))
+(associate! vagrant-mode :files ("Vagrantfile"))
 
 (use-package rspec-mode
   :defer t
   :mode ("/\\.rspec$" . text-mode)
   :init
-  (associate! rspec-mode :match "\\(/spec_helper\\|_spec\\)\\.rb$")
   (associate! rspec-mode :match "/\\.rspec$")
+  (associate! rspec-mode :in (ruby-mode yaml-mode) :files ("spec/"))
 
   (defvar rspec-mode-verifiable-map (make-sparse-keymap))
   (defvar evilmi-ruby-match-tags