Tidied up and alphabeticalised definitions section