Some cosmetic changes.

Still no separate array for the cluster size and the cluster size
histogram is not computed yet. This is the next step.