REFACTOR clean_up_after_form and clean_up_form => clear_up_form