Message refactoring