Refactor init.el