Cleaning need to be improved