Simplify return statement
wrap EventHandler's consumerEventListeners usages to synchronized blocks and prevent possible deadlock