Fixes #2 - Using Channel less excessively in Channel struct