Small cleanup of formatting.
Add new timer code for working with futures.