Improve channel form
Clean up