refactor t_x_data to cluster_s