Refactoring Message Class