Location settings + refactoring