Refactor and improve vimrc