diff --git a/06company-yasnippet.el b/06company-yasnippet.el
index 0b4be7f..8a05110 100644
--- a/06company-yasnippet.el
+++ b/06company-yasnippet.el
@@ -23,15 +23,15 @@
 (global-company-mode 1)
 (yas-global-mode 1)
 
-(setq-default company-backends '((company-capf company-keywords
-                                               company-yasnippet
-                                               )
+(setq-default company-backends '(company-capf ;; Backend for default complete-at-point function
+                                 company-keywords ;; Keyword list for all languages
+                                 company-yasnippet ;; Snippets for all programming languages
                                  company-elisp ; Emacs Lisp
-                                 (company-clang company-cmake) ;; C
+                                 company-clang company-cmake ;; C
                                  company-robe ;; Ruby
                                  alchemist-company ;; Elixir
                                  company-racer ;; Rust
-                                 (company-dabbrev-code company-dabbrev company-abbrev) ;; abbrev
+                                 company-dabbrev-code company-dabbrev company-abbrev ;; abbrev
                                  company-files ; files & directory
                                  company-ispell ; Ispell
                                  ))
diff --git a/20elisp.el b/20elisp.el
index 759dea2..30ff3d4 100644
--- a/20elisp.el
+++ b/20elisp.el
@@ -1,5 +1,3 @@
-(add-hook 'emacs-lisp-mode-hook 'flymake-mode)
-
 (defun activate-emacs-lisp-mode ()
   "Goodies for editing emacs files."
   (set-indent 2) ;; Default indentation of 2 characters
diff --git a/20ruby.el b/20ruby.el
index 3818d16..ad0d982 100644
--- a/20ruby.el
+++ b/20ruby.el
@@ -7,7 +7,6 @@
 (add-hook 'ruby-mode-hook 'enh-ruby-mode)
 (add-hook 'enh-ruby-mode-hook 'robe-mode)
 (add-hook 'enh-ruby-mode-hook 'ruby-end-mode)
-(add-hook 'enh-ruby-mode-hook 'flymake-mode)
 
 (eval-after-load 'company
   '(push 'company-robe company-backends))
@@ -22,10 +21,7 @@
     (column-enforce-n 80))
 
   ;; Do not insert magic encoding comment at the begining of each file
-  (setq ruby-insert-encoding-magic-comment nil)
-
-  ;; Start flymake
-  (flymake-ruby-load))
+  (setq ruby-insert-encoding-magic-comment nil))
 
 (add-hook 'enh-ruby-mode-hook 'activate-ruby-mode)
 
@@ -38,4 +34,3 @@
       '(("erb"  . (("<%" "%>")
                    ("beg" "end")))
         ))
-(add-hook 'web-mode-hook 'flymake-mode)
diff --git a/20rust.el b/20rust.el
index 58f5a94..f562cd3 100644
--- a/20rust.el
+++ b/20rust.el
@@ -4,8 +4,6 @@
   (set-indent 4)
   (column-enforce-n 99))
 
-  ;; (flymake-rust-setup))
-
 (add-hook 'rust-mode-hook 'activate-rust-mode)
 (add-hook 'rust-mode-hook 'racer-mode)
 (add-hook 'rust-mode-hook 'flycheck-rust-setup)