some random cleanup and hacks on vim