Update form cleanup and modernization