mini refactor
Merge pull request #7 from maraoz/integrate/channels

mini refactor