Message and formatting cleanup