+ Better modularization
+ Overlapping clustering bug fixed