tighten up, refactor flickr