Refactors

e.g. countrydetail -> country