Addressed code review comments
Addressed code review comments

nathawes/swift,jckarter/swift,glessard/swift,benlangmuir/swift,tkremenek/swift,benlangmuir/swift,JGiola/swift,apple/swift,rudkx/swift,xwu/swift,nathawes/swift,gregomni/swift,ahoppen/swift,xwu/swift,jmgc/swift,rudkx/swift,CodaFi/swift,benlangmuir/swift,xwu/swift,apple/swift,apple/swift,roambotics/swift,CodaFi/swift,rudkx/swift,JGiola/swift,harlanhaskins/swift,parkera/swift,nathawes/swift,allevato/swift,jmgc/swift,hooman/swift,atrick/swift,atrick/swift,roambotics/swift,ahoppen/swift,glessard/swift,tkremenek/swift,airspeedswift/swift,jmgc/swift,hooman/swift,roambotics/swift,parkera/swift,benlangmuir/swift,stephentyrone/swift,roambotics/swift,hooman/swift,harlanhaskins/swift,benlangmuir/swift,jckarter/swift,allevato/swift,xwu/swift,ahoppen/swift,JGiola/swift,CodaFi/swift,airspeedswift/swift,xwu/swift,glessard/swift,allevato/swift,harlanhaskins/swift,apple/swift,harlanhaskins/swift,parkera/swift,tkremenek/swift,jckarter/swift,stephentyrone/swift,allevato/swift,ahoppen/swift,tkremenek/swift,stephentyrone/swift,parkera/swift,CodaFi/swift,glessard/swift,CodaFi/swift,nathawes/swift,JGiola/swift,atrick/swift,hooman/swift,JGiola/swift,harlanhaskins/swift,parkera/swift,gregomni/swift,stephentyrone/swift,jckarter/swift,jckarter/swift,benlangmuir/swift,airspeedswift/swift,jckarter/swift,roambotics/swift,airspeedswift/swift,xwu/swift,gregomni/swift,airspeedswift/swift,tkremenek/swift,allevato/swift,JGiola/swift,hooman/swift,atrick/swift,ahoppen/swift,apple/swift,parkera/swift,hooman/swift,rudkx/swift,rudkx/swift,xwu/swift,allevato/swift,gregomni/swift,tkremenek/swift,allevato/swift,roambotics/swift,jmgc/swift,ahoppen/swift,apple/swift,airspeedswift/swift,nathawes/swift,stephentyrone/swift,glessard/swift,harlanhaskins/swift,parkera/swift,gregomni/swift,atrick/swift,rudkx/swift,CodaFi/swift,jmgc/swift,nathawes/swift,tkremenek/swift,parkera/swift,jmgc/swift,nathawes/swift,gregomni/swift,CodaFi/swift,atrick/swift,glessard/swift,airspeedswift/swift,stephentyrone/swift,jckarter/swift,hooman/swift,harlanhaskins/swift,jmgc/swift,stephentyrone/swift