Cleaning should be done better