Tidied up use of Futures