overall form cleanup