Refactored combined use of await and .then to use await only#225

GantMan merged 2 commits intoinfinitered:masterinfinitered/solidarity:masterfrom

taylanken:consistent_awaitCopy head branch name to clipboard