Added to_async()
Cleanup