make country/country code a key-vallue array, standardize CRUD method returns