update vim, need refacto