Code review fixes
Code review fixes

bac/juju,AdamIsrael/juju,waigani/juju,macgreagoir/juju,dimitern/juju,alesstimec/juju,kat-co/juju,bogdanteleaga/juju,frankban/juju,macgreagoir/juju,dooferlad/juju,waigani/juju,makyo/juju,axw/juju,ericsnowcurrently/juju,waigani/juju,mjs/juju,mjs/juju,AdamIsrael/juju,bac/juju,bz2/juju,bac/juju,frankban/juju,reedobrien/juju,makyo/juju,ericsnowcurrently/juju,kat-co/juju,reedobrien/juju,ericsnowcurrently/juju,anastasiamac/juju,alesstimec/juju,alesstimec/juju,alesstimec/juju,mjs/juju,mjs/juju,mikemccracken/juju,dooferlad/juju,gabriel-samfira/juju,AdamIsrael/juju,dimitern/juju,axw/juju,marcmolla/juju,howbazaar/juju,dimitern/juju,kat-co/juju,gabriel-samfira/juju,mikemccracken/juju,mikemccracken/juju,mjs/juju,AdamIsrael/juju,mjs/juju,axw/juju,bz2/juju,makyo/juju,howbazaar/juju,perrito666/juju,kat-co/juju,anastasiamac/juju,marcmolla/juju,marcmolla/juju,perrito666/juju,mikemccracken/juju,mjs/juju,bac/juju,axw/juju,bz2/juju,mikemccracken/juju,macgreagoir/juju,alesstimec/juju,howbazaar/juju,marcmolla/juju,perrito666/juju,ericsnowcurrently/juju,anastasiamac/juju,gabriel-samfira/juju,anastasiamac/juju,anastasiamac/juju,perrito666/juju,ericsnowcurrently/juju,marcmolla/juju,macgreagoir/juju,howbazaar/juju,frankban/juju,bogdanteleaga/juju,frankban/juju,bz2/juju,macgreagoir/juju,reedobrien/juju,frankban/juju,gabriel-samfira/juju,bogdanteleaga/juju,gabriel-samfira/juju,bac/juju,makyo/juju,dooferlad/juju,reedobrien/juju,dimitern/juju,axw/juju,howbazaar/juju,dimitern/juju,dooferlad/juju,waigani/juju,reedobrien/juju,bogdanteleaga/juju,kat-co/juju,perrito666/juju,dooferlad/juju,bz2/juju