Added cleanup & preprocessing
Tidied up data load, reoorganized sections