Refactor spider to separate control/scrap