refactor scaffold
refixed