deleted some comments
added cleaner class