Clean up keymap, fix typo in init.el