updated Cleaner class

still need changes