refactored PictureRetriever