Review fixes

FuturePool to manage futures
Use Future.when
Indentation fix