Clean up message formatting