tidy up forms