diff --git a/init.el b/init.el
index 91832e3..29884c2 100644
--- a/init.el
+++ b/init.el
@@ -19,7 +19,7 @@
 (setq coding-system-for-write 'utf-8 )
 (setq sentence-end-double-space nil)	; sentence SHOULD end with only a point.
 (setq initial-scratch-message "Welcome in Emacs") ; print a default message in the empty scratch buffer opened at startup
-(setq focus-follows-mouse nil)
+(setq focus-follows-mouse nil)  ; stop popups from getting focus
 
 ;; global keybindings
 (global-set-key (kbd "C-k") 'previous-line)
@@ -60,10 +60,7 @@
   :ensure t
   :config
   (global-evil-surround-mode 1)
-  (evil-define-key 'visual evil-surround-mode-map "s" 'evil-surround-region)
-  )
-(use-package evil-matchit :ensure t
-  :config (global-evil-matchit-mode 1))
+  (evil-define-key 'visual evil-surround-mode-map "s" 'evil-surround-region))
 
 ;; ivy config
 (use-package ivy :ensure t
@@ -114,33 +111,12 @@
 ;; js
 (use-package js2-mode :ensure t
   :config (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode)))
-;; puppet
-(use-package puppet-mode :ensure t
-  :config
-  (add-to-list 'auto-mode-alist '("\\.pp\\'" . puppet-mode))
-  (general-define-key
-    :states '(normal visual insert emacs)
-    :keymaps 'puppet-mode-map
-    :prefix "SPC"
-    :non-normal-prefix "C-SPC"
-    "ma"   'puppet-align-block
-    )
-  )
-;; php
-(use-package php-mode :ensure t)
-;; k8s
-(use-package k8s-mode :ensure t)
-;; hcl
-(use-package hcl-mode :ensure t)
 ;; rust
 (use-package rust-mode :ensure t
   :config
   (setq rust-format-on-save t)
   (add-hook 'rust-mode-hook
-            (lambda () (setq indent-tabs-mode nil)))
-  )
-(add-hook 'rust-mode-hook
-          (lambda () (setq indent-tabs-mode nil)))
+            (lambda () (setq indent-tabs-mode nil))))
 ;; golang
 (use-package go-mode :ensure t
   :config
@@ -165,18 +141,12 @@
               (evil-org-set-key-theme)))
   (require 'evil-org-agenda)
   (evil-org-agenda-set-keys))
+;; bazel / starlak
+(use-package bazel-mode :ensure t)
 
 ;; code-with-fun
 (use-package rainbow-mode :ensure t)
 (use-package hl-todo :ensure t)
-  
-(use-package company :ensure t
-
-;; bazel / starlak
-(use-package bazel-mode :ensure t)
-
-
-;; code-with-fun
 (use-package whitespace
   :config
   (setq whitespace-style '(face empty tabs lines-tail trailing))
@@ -194,7 +164,6 @@
     company-dabbrev-ignore-case nil
     company-dabbrev-downcase nil)
  )
-(use-package highlight-indentation :ensure t)
 
 ;; lsp
 (use-package lsp-mode :ensure t
@@ -242,8 +211,8 @@
         lsp-before-save-edits t
         lsp-enable-snippet t
 	)
-  (defvar lsp-vetur-validation-template nil)
-  )
+  (defvar lsp-vetur-validation-template nil))
+
 (use-package flycheck :ensure t
   :init (global-flycheck-mode))
 (use-package lsp-ui :ensure t
@@ -390,10 +359,7 @@
     "wv"          'split-window-right
     "wV"          'split-window-right-and-focus
     "ww"          'other-window
-    "wx"          'kill-buffer-and-window
-
-    
-    ))
+    "wx"          'kill-buffer-and-window))
 
 ;; custom functions