- refactor country name