pavo: tidied up the Grammar and Lexer Grammar