add WaitEventId field to each user
go fmt and comments