Clean-up forms a bit