Slight cleanup of chat