Finalization for improved parsing