tidy up message creation more