updated fieldset little cleaner