Refactoring messages