don't use tokens as variables names
Update Parser