[Clustering] Now we make the source more readable...
[Clustering] Now integrated to master source...