Changing urllib to requests module.  Also, restructured class slightly