[Parser] Added inner-loop re-ordering