Refactor PointFinder.