removed incomplete parser, improved variables names