geolocalized-tasks: Code's clean-up