Use Activators for each activation strategy
Fix undefined variable
Merge pull request #2 from thibaud-evaneos/refactor-activation

Refactor activation