Minor event controller cleanup