events can expire now

minor refactoring