restructuring of parsing scheme