Improve async code.
Improve readability.