Proposal for formatting

Made some parts more consistent and shorter before I started to implement autoreconnect feature. Additionally I, personally, would transform the comma-first-notation part to normal also, but that's more of a philosophical reason I guess.

This is a proposal for code formatting. Logic didn't change on these.