Quarterly VIM refactor