Event and Member business logic cleaned up