phpdoc
Refactoring of events