Elisp refactor