Refactor Dictionary.