Refined the cluster types and added seperated the plotting.