Cleaning up the location field