Field clean up

Location & Date