Better cleaning, updated data