Refactoring message