cleaned up the forms