updated cleaner class

still need changes