add file checking to cleaner
improve cleaner and extractor