message formatting cleanup