changed: Reformat messages