Refactor state country assoc