refactoring everything for the Yahoo API