Removed the async wrappers and cosmetic improvements
Cosmetic changes