removed shape_cluster.h
some refactoring and comments