refactor Dictionary class.

No match.