Clean Data + Model

Clean data and model for non-statistical and statistical measures.