Cleaning up the request channel form. Fixes #16 and #15.