Made vim interface just a bit cleaner