Tidied up BaseHTTPFuture file