Reorganized data flow / wrangling.