VIM updates and clean up