Improve operation of data cleaner