Refactor vimrc maps