Further clean up of data edit form