Tidy data set, minor changes