Tidying up a messy Form