Clean up comments
Use async for flow control