Making "keys" and "values" not global