Removed duplication in event controller