Tidied the form