Removed unneeded code, added all form options

Included all the forms for easy comment selection of forms to use, and
cleaned the code up, with removal of unused code and the addition of
comments