Renaming & refactoring to prepare for switch to httr