Refactored ChannelList and some cleanup.