refactor _wanted routines
Merge pull request #16 from unc0/zsh-completion

refactor _wanted routines