major refactor in the async infra-structure with proper comments