Attempt to kill duplication by defining keys and values seperately