Code clean up
Updated forms for comment views