edit tree stucture to be more representative of actual parsing