Listeners and events refactoring
PHPCS