Refactoring of example code created by choces using EventBus instead of listeners