Refactoring Emacs setup