Enable shortcuts only in MacVim
Minor refactoring