Cleanup and refactor a little
Cleanup and refactor a little

dietsche/letsencrypt,DavidGarciaCat/letsencrypt,letsencrypt/letsencrypt,bsmr-misc-forks/letsencrypt,jtl999/certbot,thanatos/lets-encrypt-preview,bsmr-misc-forks/letsencrypt,brentdax/letsencrypt,thanatos/lets-encrypt-preview,mitnk/letsencrypt,jsha/letsencrypt,jtl999/certbot,DavidGarciaCat/letsencrypt,letsencrypt/letsencrypt,dietsche/letsencrypt,TheBoegl/letsencrypt,wteiken/letsencrypt,stweil/letsencrypt,jsha/letsencrypt,stweil/letsencrypt,lmcro/letsencrypt,TheBoegl/letsencrypt,lmcro/letsencrypt,wteiken/letsencrypt,brentdax/letsencrypt,mitnk/letsencrypt