organize feature extractor class better