Modify message
Refactor