Reorg code for early return