Refactor
Modify message