Cleanup
Refine mprYield