Factor out mutable dependency FeatureSet
Factor out mutable dependency FeatureSet - Tidying