Converted data to dataset; major changes to cleaning (simpler)