Cleanup data transformations + Add average