LocationShare - refactor