More work on cleaning data