Simplification.
Add a line break.
Merge pull request #248 from manubb/master

Simplication in handlers activation/desactivation.