diff --git a/emacs/init.el b/emacs/init.el
index ba6111f..e540b82 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -598,14 +598,9 @@
 ;; Don't clobber the OS clipboard completely
 (setq save-interprogram-paste-before-kill t)
 
-;; automatically cleanup whitespace on save
-(defun my-whitespace-cleanup ()
-  "Run `whitespace-cleanup' except for TSV files."
-  (unless (or (derived-mode-p 'text-mode) ; Adjust this check if necessary
-              (string-match "\\.tsv\\'" buffer-file-name))
-    (whitespace-cleanup)))
-
-(add-hook 'before-save-hook 'my-whitespace-cleanup)
+(use-package ws-butler
+  :ensure t
+  :hook (prog-mode . ws-butler-mode))
 
 ;; clean up backup file spam
 (setq backup-directory-alist `(("." . "~/.saves")