Tidying in ChannelFrame.
Merge pull request #169 from greboid/tidying

Tidying in ChannelFrame.