Refactor for Vypass.vim