Fix a crash, where the channel keys were corrected incorrectly.
Apparently, this is why we needed an attr_reader to connection. Fix that.
Style changes, whitespace fixes.