ENH: Simplifiacations to feature selection setup