Substantial clean up of edit form