#79 Refactor events with no return value