In the process of streamlining the clustering coefficient functions