Format message better