Refactor
Refactor: use dict comprehension
old_value has no key new_key
Refactor