vim: clean-up