Make better message format