Fix closet/farthest pair of points
Data structure refactoring