LocationFinder refactor