Added comments to form, restructured form