Simplify createFeaturesSet()