Minor refactoring
Update vim plugins