further work on tidying forms