now with tidy data
minor changes in wording, format