Refine distance calcs