Added formatting for the messages