Refactor CountryController