renamed event listener/event adapter, removed unnecessary imports etc.