work on form cleanup