tidied up form