moved comment form into forms and removed redundant code