Refactoring the cleaner classes