vim: more cleanups