Use clustering results, reformat better