user location tidy up