Tidied up the grammar