Refactoring: moved event bus to separate class