Simple refactoring of messages