[mod-event-feeder] - Refactor code.