Some better formatting and dropping connections