Debut refactorisation State/Strategy