changes cleanup so that each row corresponds to one object