merged country names, refactorings