Vim cleanup, dictionary adds