Form cleanup

Mostly form cleanup.