Clean code
Add WaitUntil and WaitFor