Refine angle/distance calculations