Refactor upToSevenAway to return points and distance only when needed