Refactor event calls to be modular