form tidy up