Cleaning up

Cleaning up and unifying data export.