Separate out data cleanup and Analysis in two different files.