Address review comments
Address review comments

Also added more comments for clarity.

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