Refactor message style