Tidy data

Expanded discussion