more vim cleanup