Tidied the parser a bit