Code Cleanup
Added Channel to Message Data