Merge "Refactor of DataGrooming main script"