Vim clean up