Data preparation and cleaning

No significant changes to be noted