geoscape refactor