Refactor to eliminate chain of Futures