code clean up
refactor country