Tidying up of various forms