cleanup: created new data class to process the data and keep data prep and model separate. Cosmetics.