Code factorisation

Remove before() and after() methods
Add the triggers to the run() method
Remove unused variable