cleaned Extractor a little