Tidied up a few forms