Cleaning up the form components