Reflect comments on PR from @zachmayer