Moving keys and values to constants