Improving message format