vim cleanups
vim cleanups