Updated script and tidy data