Refactor vocabulary fit_transform/transform for feature_extraction