Fixed up tidy_data to include correct columns