Refactor events after feedback from Mike