Forms and some clean up.