Working on cleaning up forms.