refactor account countries