Various improvements to event_based_fr
Removed useless comments