Fix vimrc commenting and redundant function calls