improve variable name
clean up regular expression in parser (not problematic as it only matches what the scanner already accepted)
clean up some whitespace in parser code