refactor, improve scrap