changed a lot cleaners.py and extractors.py