Vim: refactor
Vim: Add dictionary completion