slight restructuring of vimrc