Vim: Cleanup and more