Refactor world to store countries in a map.