Refactor: factor out creating locations

Also bring _make_surge_predictions out of a class