Refactoring to use ES6 async generators
some adjusts