Refactor Channels.groovy