Addressing code review comments.
Addressing code review comments.

jonsequitur/cli,ravimeda/cli,livarcocc/cli-1,livarcocc/cli-1,dasMulli/cli,weshaggard/cli,naamunds/cli,johnbeisner/cli,naamunds/cli,AbhitejJohn/cli,livarcocc/cli-1,AbhitejJohn/cli,harshjain2/cli,AbhitejJohn/cli,blackdwarf/cli,Faizan2304/cli,svick/cli,dasMulli/cli,weshaggard/cli,harshjain2/cli,AbhitejJohn/cli,weshaggard/cli,svick/cli,ravimeda/cli,jonsequitur/cli,svick/cli,weshaggard/cli,jonsequitur/cli,weshaggard/cli,naamunds/cli,nguerrera/cli,EdwardBlair/cli,nguerrera/cli,naamunds/cli,nguerrera/cli,EdwardBlair/cli,blackdwarf/cli,johnbeisner/cli,jonsequitur/cli,mlorbetske/cli,ravimeda/cli,mlorbetske/cli,naamunds/cli,mlorbetske/cli,blackdwarf/cli,Faizan2304/cli,mlorbetske/cli,EdwardBlair/cli,Faizan2304/cli,dasMulli/cli,harshjain2/cli,johnbeisner/cli,blackdwarf/cli,nguerrera/cli