cleaned up feature_extraction v2