Cleaning up Vim section to work with new structure.