Refactor
Updated scraps