core/event: code cleaning