tidied up forms