Form evolution + cleaning