tidy up form a bit