refactored country