Refactor
Location Fix by Google Play Service API