Refactored validation for country