Updated data cleanup and plot labeling