vim: Spring cleaning