Refactor + Split between bad and good samples