removed Country
cleaned up class names