Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: buttaface <32a6fcbaa4543f0718079837a574f5835f3143fe@butta.fastem.com>
ahoppen/swift,ahoppen/swift,atrick/swift,apple/swift,glessard/swift,benlangmuir/swift,roambotics/swift,gregomni/swift,glessard/swift,ahoppen/swift,apple/swift,apple/swift,glessard/swift,apple/swift,gregomni/swift,JGiola/swift,roambotics/swift,ahoppen/swift,JGiola/swift,apple/swift,atrick/swift,benlangmuir/swift,benlangmuir/swift,JGiola/swift,atrick/swift,atrick/swift,gregomni/swift,benlangmuir/swift,glessard/swift,roambotics/swift,atrick/swift,atrick/swift,JGiola/swift,gregomni/swift,gregomni/swift,glessard/swift,benlangmuir/swift,gregomni/swift,roambotics/swift,ahoppen/swift,apple/swift,JGiola/swift,ahoppen/swift,roambotics/swift,benlangmuir/swift,roambotics/swift,JGiola/swift,glessard/swift