Moved more code out of vimrc