Refactor FlickrRetriever