some cleanup in vimrc and keymap