Tiny step on form cleanup but clearly we have a lot to think about.