Fixed ConfigureAwait chaining. Cleaned up the code a little more.