Some refactoring on channels list