Tidy up vim section substantially.