Cleaned up feature_selection