cleaned up syntax
Prepared for using the LocationService.