cleaned up distance computation in Geo