Refactor and add more elisp keybindings