Refactorings
Refactoring asynchronous wait for requests by using async instead of own tailored solution