Refactor EventArgs