Origanizing the data better