Refactor message