refactor countryControl
minor edit