Refactoring

- added location provider