Refactoring for clustering coefficient and modularity, adding and refactoring unit tests