cleanup/formatting and added a fieldset element to the form