Channels controller cleanup
Merge pull request #3 from wecodeio/channels-cleanup

Channels controller cleanup