[vim] code tweaks