Refactor Messages