Refactored the feature extraction.