flickr refactoring