Apply suggestions from code review
Apply suggestions from code review

Added @mvanbeusekom's changes to the PR.

Co-authored-by: Maurits van Beusekom <863c1f7b4d465b5bbc9cb70461ad5ec7b7a63f94@vnbskm.nl>
Baseflow/flutter-geolocator,Baseflow/flutter-geolocator,Baseflow/flutter-geolocator,Baseflow/flutter-geolocator