Patches to PRW and event cleaning comments

Rolls the changes to PRW in from !18 (merged)

Also updates the comment on event cleaning to be a bit more clear

@shahzad , FYI (will also try to push the same changes in other places)