Organized code some more, switch Yahoo's YQL API