Further refactoring
Further refactoring

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