Clean up, better message formatting