Small rewrite to use requests lib