Apply suggestions from code review
Apply suggestions from code review

Co-Authored-By: Luke Shumaker <1abe3165bcc8c29e8b31e5c88636540fb9350004@datawire.io>
datawire/ambassador,datawire/ambassador,datawire/ambassador,datawire/ambassador,datawire/ambassador