refactor LocationHelper