emacs: refactoring