Removed unnecessary async/await; addded ConfigureAwait to the remainder