Cleaning up the mess in FlickrOAuthClient