Fix style in connector module

This PR cleanes the style in the connector module (the branchname may not be
appropriate here..., please don't mind!).

This PR also introduces a logic-fix, so it is not _entirely_ about style.

@neithernut Please review carefully (the logic-fix), I am (/ we are)
not entirely sure about it,...
I would like to hear @neithernut 's opinion about that as well.