CLIMATE-638 - Fix urllib import and minor clean up
CLIMATE-638 - Fix urllib import and minor clean up

agoodm/climate,lewismc/climate,lewismc/climate,MJJoyce/climate,riverma/climate,huikyole/climate,apache/climate,huikyole/climate,jarifibrahim/climate,MBoustani/climate,riverma/climate,MBoustani/climate,jarifibrahim/climate,lewismc/climate,huikyole/climate,agoodm/climate,pwcberry/climate,MBoustani/climate,riverma/climate,MBoustani/climate,MJJoyce/climate,jarifibrahim/climate,huikyole/climate,riverma/climate,agoodm/climate,huikyole/climate,apache/climate,jarifibrahim/climate,riverma/climate,jarifibrahim/climate,agoodm/climate,apache/climate,pwcberry/climate,Omkar20895/climate,Omkar20895/climate,apache/climate,MBoustani/climate,apache/climate,lewismc/climate,agoodm/climate,pwcberry/climate,pwcberry/climate,Omkar20895/climate,pwcberry/climate,MJJoyce/climate,MJJoyce/climate,Omkar20895/climate,Omkar20895/climate,lewismc/climate,MJJoyce/climate