Several code modifications in the tidy data set