code cleanup in ChannelSelection,