Refactoring Message Events