Réfactoring Selection on Stategy pattern