some more locationservice refactoring