Minor Flickr plugin refactoring