Improving location strategy, preparing for Settings storage