Cleaned up external feature extractor.