Refactor vim hotkeys