Cleanup - made callbacks final, boolean for waitForCallback volatile