added cleanup of feature names