picture spider service refactor