[vim keymap] Remove duplicated @ logic
[vim keymap] Remove q swapping