Cleanup logging messages

Cleanup logging messages so that the logs are easy to read and follow. 

E.g. change the logging in Wait condition to debug level.