made minor changes to FeatureExtractor code