AC-24_25 Added WaitHelper class
Minor refactoring and code cleaning.