Addded doc-commetns.
Refactore Cleaner implementation.