Refactor Controller

Refactor Event controller