Refactored vimrc