Range radii - Some cleanup