More consistent connection formatting per suggestion from Matthias