Clean up data-analysis