A small clean up and reordering.
Added in PrivateMessage event. This works the same way as public
message.