remove one instance of compute_form_data; tidy up