Tidy up chat messages, conform to java standards